diff --git a/htdocs/user/perms.php b/htdocs/user/perms.php index f45b2b155fd..5bb953c3a9d 100644 --- a/htdocs/user/perms.php +++ b/htdocs/user/perms.php @@ -261,15 +261,18 @@ print '
'; print ''; print ''; print ''; -if ($caneditperms && empty($objMod->rights_admin_allowed) || empty($object->admin)) +if (($caneditperms && empty($objMod->rights_admin_allowed)) || empty($object->admin)) { - print ''; + if ($caneditperms) + { + print ''; + } + print ''; } -print ''; print ''; print ''."\n"; @@ -324,7 +327,7 @@ if ($result) print ''; - // Picto and label of permission + // Picto and label of module print ''; // Permission and tick @@ -383,6 +386,7 @@ if ($result) print ''; } + // Label $permlabel=($conf->global->MAIN_USE_ADVANCED_PERMS && ($langs->trans("PermissionAdvanced".$obj->id)!=("PermissionAdvanced".$obj->id))?$langs->trans("PermissionAdvanced".$obj->id):(($langs->trans("Permission".$obj->id)!=("Permission".$obj->id))?$langs->trans("Permission".$obj->id):$langs->trans($obj->libelle))); print '';
'.$langs->trans("Module").''; - print ''.$langs->trans("All").""; - print '/'; - print ''.$langs->trans("None").""; - print ''; + print ''.$langs->trans("All").""; + print '/'; + print ''.$langs->trans("None").""; + print '  '.$langs->trans("Permissions").'
'.img_object('',$picto,'class="pictoobjectwidth"').' '.$objMod->getName().' '.$permlabel.'