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

Fix some regression with new architecture for groups

Browse Source
This commit is contained in:
Laurent Destailleur 2020-04-19 14:19:34 +02:00
parent 01f96b35ed
commit 200c29bd14
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
htdocs/user/card.php
View File

@ -1993,6 +1993,8 @@ else
if ($canreadgroup) if ($canreadgroup)
{ {
print '<!-- Group section -->'."\n";
print load_fiche_titre($langs->trans("ListOfGroupsForUser"), '', ''); print load_fiche_titre($langs->trans("ListOfGroupsForUser"), '', '');
// On selectionne les groupes auquel fait parti le user // On selectionne les groupes auquel fait parti le user
@ -2031,13 +2033,11 @@ else
print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity); print $form->select_dolgroups('', 'group', 1, $exclude, 0, '', '', $object->entity);
print ' &nbsp; '; print ' &nbsp; ';
print '<input type="hidden" name="entity" value="'.$conf->entity.'" />'; print '<input type="hidden" name="entity" value="'.$conf->entity.'" />';
print '<input type="submit" class="button" value="'.$langs->trans("Add").'" />'; print '<input type="submit" class="button buttongen" value="'.$langs->trans("Add").'" />';
} }
print '</th></tr>'."\n"; print '</th></tr>'."\n";
/* // List of groups of user
* Groups assigned to user
*/
if (!empty($groupslist)) if (!empty($groupslist))
{ {
foreach ($groupslist as $group) foreach ($groupslist as $group)
@ -2085,7 +2085,7 @@ else
} }
/* /*
* Fiche en mode edition * Card in edit mode
*/ */
if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id))) if ($action == 'edit' && ($canedituser || $caneditfield || $caneditpassword || ($user->id == $object->id)))
{ {

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

@ -160,6 +160,8 @@ class UserGroup extends CommonObject
$result = $this->fetchCommon($id); $result = $this->fetchCommon($id);
} }
$this->name = $this->nom; // For compatibility with field name
if($result) if($result)
{ {
if ($load_members) if ($load_members)