lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0

Browse Source
This commit is contained in:
Laurent Destailleur 2017-05-29 10:15:30 +02:00
commit 4a330af4bf
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
htdocs/user/class/usergroup.class.php
View File

@ -335,16 +335,16 @@ class UserGroup extends CommonObject
$error++; $error++;
dol_print_error($this->db); dol_print_error($this->db);
} }
if (! $error) if (! $error)
{ {
$this->context = array('audit'=>$langs->trans("PermissionsAdd")); $this->context = array('audit'=>$langs->trans("PermissionsAdd"));
// Call trigger // Call trigger
$result=$this->call_trigger('GROUP_MODIFY',$user); $result=$this->call_trigger('GROUP_MODIFY',$user);
if ($result < 0) { $error++; } if ($result < 0) { $error++; }
// End call triggers // End call triggers
} }
} }
if ($error) { if ($error) {
@ -444,11 +444,11 @@ class UserGroup extends CommonObject
$error++; $error++;
dol_print_error($this->db); dol_print_error($this->db);
} }
if (! $error) if (! $error)
{ {
$this->context = array('audit'=>$langs->trans("PermissionsDelete")); $this->context = array('audit'=>$langs->trans("PermissionsDelete"));
// Call trigger // Call trigger
$result=$this->call_trigger('GROUP_MODIFY',$user); $result=$this->call_trigger('GROUP_MODIFY',$user);
if ($result < 0) { $error++; } if ($result < 0) { $error++; }
@ -805,7 +805,7 @@ class UserGroup extends CommonObject
$muser=new User($this->db); $muser=new User($this->db);
$muser->fetch($val->id); $muser->fetch($val->id);
$info2 = $muser->_load_ldap_info(); $info2 = $muser->_load_ldap_info();
$valueofldapfield[] = $muser->_load_ldap_dn($info2); $valueofldapfield[] = $muser->_load_ldap_dn($info2);
} }
$info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield)?$valueofldapfield:''); $info[$conf->global->LDAP_GROUP_FIELD_GROUPMEMBERS] = (!empty($valueofldapfield)?$valueofldapfield:'');
} }
@ -833,7 +833,11 @@ class UserGroup extends CommonObject
$this->note='This is a note'; $this->note='This is a note';
$this->datec=time(); $this->datec=time();
$this->datem=time(); $this->datem=time();
$this->members=array($user->id); // Members of this group is just me
// Members of this group is just me
$this->members=array(
$user->id => $user
);
} }
} }