diff --git a/htdocs/user/card.php b/htdocs/user/card.php index 84665839c6b..ba327e7c9f1 100644 --- a/htdocs/user/card.php +++ b/htdocs/user/card.php @@ -1231,7 +1231,7 @@ else if ($mode == 'employee') // For HRM module development { $title = $langs->trans("Employee"); - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; } else { @@ -1239,7 +1239,7 @@ else $linkback = ''; if ($user->rights->user->user->lire || $user->admin) { - $linkback = ''.$langs->trans("BackToList").''; + $linkback = ''.$langs->trans("BackToList").''; } } diff --git a/htdocs/user/group/card.php b/htdocs/user/group/card.php index 5a68dd1391b..8f99fa1bb81 100644 --- a/htdocs/user/group/card.php +++ b/htdocs/user/group/card.php @@ -330,7 +330,9 @@ else { dol_fiche_head($head, 'group', $title, -1, 'group'); - dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); + $linkback = ''.$langs->trans("BackToList").''; + + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; print '
'; diff --git a/htdocs/user/group/index.php b/htdocs/user/group/index.php index 0fcd2af98f2..79e54ee247c 100644 --- a/htdocs/user/group/index.php +++ b/htdocs/user/group/index.php @@ -181,7 +181,7 @@ if ($resql) { $obj = $db->fetch_object($resql); - $grouptemp->id = $obj->id; + $grouptemp->id = $obj->rowid; $grouptemp->name = $obj->name; $grouptemp->note = $obj->note; diff --git a/htdocs/user/group/ldap.php b/htdocs/user/group/ldap.php index ae0d974be9a..baf30a02399 100644 --- a/htdocs/user/group/ldap.php +++ b/htdocs/user/group/ldap.php @@ -105,7 +105,9 @@ $head = group_prepare_head($object); dol_fiche_head($head, 'ldap', $langs->trans("Group"), -1, 'group'); -dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); +$linkback = ''.$langs->trans("BackToList").''; + +dol_banner_tab($object,'id',$linback,$user->rights->user->user->lire || $user->admin); print '
'; print '
'; diff --git a/htdocs/user/group/perms.php b/htdocs/user/group/perms.php index 3b6d7037229..740b106c728 100644 --- a/htdocs/user/group/perms.php +++ b/htdocs/user/group/perms.php @@ -191,8 +191,9 @@ if ($object->id > 0) dol_print_error($db); } + $linkback = ''.$langs->trans("BackToList").''; - dol_banner_tab($object,'id','',$user->rights->user->user->lire || $user->admin); + dol_banner_tab($object,'id',$linkback,$user->rights->user->user->lire || $user->admin); print '
'; print '
'; diff --git a/htdocs/user/index.php b/htdocs/user/index.php index b2cdd9e3dc6..6f9ac1f638a 100644 --- a/htdocs/user/index.php +++ b/htdocs/user/index.php @@ -435,7 +435,7 @@ while ($i < min($num,$limit)) $userstatic->employee=$obj->employee; $userstatic->photo=$obj->photo; - $li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login'); + $li=$userstatic->getNomUrl(-1,'',0,0,24,1,'login','',1); print ""; if (! empty($arrayfields['u.login']['checked'])) @@ -541,7 +541,7 @@ while ($i < min($num,$limit)) $user2->admin=$obj->admin2; $user2->email=$obj->email2; $user2->socid=$obj->fk_soc2; - print $user2->getNomUrl(-1,'',0,0,24,0,''); + print $user2->getNomUrl(-1,'',0,0,24,0,'','',1); if (! empty($conf->multicompany->enabled) && $obj->admin2 && ! $obj->entity2) { print img_picto($langs->trans("SuperAdministrator"), 'redstar', 'class="valignmiddle paddingleft"');