diff --git a/htdocs/includes/menus/barre_left/eldy_backoffice.php b/htdocs/includes/menus/barre_left/eldy_backoffice.php index c04baec81b3..6a0275c7665 100644 --- a/htdocs/includes/menus/barre_left/eldy_backoffice.php +++ b/htdocs/includes/menus/barre_left/eldy_backoffice.php @@ -145,10 +145,10 @@ class MenuLeft { $langs->load("users"); $newmenu->add(DOL_URL_ROOT."/user/home.php?leftmenu=users", $langs->trans("MenuUsersAndGroups")); - if ($leftmenu=="users") $newmenu->add_submenu(DOL_URL_ROOT."/user/index.php", $langs->trans("Users")); - if ($leftmenu=="users") $newmenu->add_submenu(DOL_URL_ROOT."/user/fiche.php?action=create", $langs->trans("NewUser"),2); - if ($leftmenu=="users") $newmenu->add_submenu(DOL_URL_ROOT."/user/group/index.php", $langs->trans("Groups")); - if ($leftmenu=="users") $newmenu->add_submenu(DOL_URL_ROOT."/user/group/fiche.php?action=create", $langs->trans("NewGroup"),2); + if ($leftmenu=="users") $newmenu->add_submenu(DOL_URL_ROOT."/user/index.php", $langs->trans("Users"), 1, $user->rights->user->user->lire || $user->admin); + if ($leftmenu=="users") $newmenu->add_submenu(DOL_URL_ROOT."/user/fiche.php?action=create", $langs->trans("NewUser"),2, $user->rights->user->user->creer || $user->admin); + if ($leftmenu=="users") $newmenu->add_submenu(DOL_URL_ROOT."/user/group/index.php", $langs->trans("Groups"), 1, $user->rights->user->user->lire || $user->admin); + if ($leftmenu=="users") $newmenu->add_submenu(DOL_URL_ROOT."/user/group/fiche.php?action=create", $langs->trans("NewGroup"), 2, $user->rights->user->user->creer || $user->admin); } /* diff --git a/htdocs/user/fiche.php b/htdocs/user/fiche.php index 15d3445aed9..b1e8b86a2e1 100644 --- a/htdocs/user/fiche.php +++ b/htdocs/user/fiche.php @@ -315,11 +315,14 @@ if ($action == 'create') print ''.$langs->trans("Password").''; print ''; - print ''.$langs->trans("Administrator").''; - print ''; - $form->selectyesnonum('admin',0); - print "\n"; - + if ($user->admin) + { + print ''.$langs->trans("Administrator").''; + print ''; + $form->selectyesnonum('admin',0); + print "\n"; + } + print ''.$langs->trans("Phone").''; print ''; @@ -486,7 +489,7 @@ else if ($fuser->admin) print ' '.img_picto($langs->trans("Administrator"),"star"); print ''; print "\n"; - + // Source print ''.$langs->trans("Source").''; print ''; @@ -763,13 +766,20 @@ else if ($fuser->societe_id > 0) { print ''; - print ''.$langs->trans("No"); + print ''.yn($fuser->admin); print ''; } else { print ''; - $form->selectyesnonum('admin',$fuser->admin); + if ($user->admin) + { + $form->selectyesnonum('admin',$fuser->admin); + } + else + { + print ''.yn($fuser->admin); + } print ''; } diff --git a/htdocs/user/group/pre.inc.php b/htdocs/user/group/pre.inc.php index 03c9e934774..402aa29624b 100644 --- a/htdocs/user/group/pre.inc.php +++ b/htdocs/user/group/pre.inc.php @@ -32,36 +32,37 @@ require(DOL_DOCUMENT_ROOT.'/usergroup.class.php'); function llxHeader($head = "", $urlp = "") { - global $user, $langs; - - /* - * - * - */ - top_menu($head); - - $menu = new Menu(); - - $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Users")); - - $menu->add_submenu(DOL_URL_ROOT."/user/", $langs->trans("List")); - - if($user->admin) + global $user, $langs; + + top_menu($head); + + $menu = new Menu(); + + + if ($user->rights->user->user->lire || $user->admin) { - $menu->add_submenu(DOL_URL_ROOT."/user/fiche.php?&action=create",$langs->trans("NewUser")); + $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Users")); + $menu->add_submenu(DOL_URL_ROOT."/user/", $langs->trans("List")); } - - $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Groups")); - - $menu->add_submenu(DOL_URL_ROOT."/user/group/", $langs->trans("List")); - - if($user->admin) + + if($user->rights->user->user->creer || $user->admin) { - $menu->add_submenu(DOL_URL_ROOT."/user/group/fiche.php?&action=create",$langs->trans("NewGroup")); + $menu->add_submenu(DOL_URL_ROOT."/user/fiche.php?&action=create", $langs->trans("NewUser")); } - - - left_menu($menu->liste); + + if ($user->rights->user->user->lire || $user->admin) + { + $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Groups")); + $menu->add_submenu(DOL_URL_ROOT."/user/group/", $langs->trans("List")); + } + + if($user->rights->user->user->creer || $user->admin) + { + $menu->add_submenu(DOL_URL_ROOT."/user/group/fiche.php?&action=create", $langs->trans("NewGroup")); + } + + + left_menu($menu->liste); } ?> diff --git a/htdocs/user/pre.inc.php b/htdocs/user/pre.inc.php index 3ad72c00e83..d6adde2dfe8 100644 --- a/htdocs/user/pre.inc.php +++ b/htdocs/user/pre.inc.php @@ -32,42 +32,36 @@ $user->getrights('user'); function llxHeader($head = "", $title = "") { - global $user,$langs; + global $user,$langs; - /* - * - * - */ - top_menu($head, $title); + top_menu($head, $title); - $menu = new Menu(); + $menu = new Menu(); - $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Users")); - - if ($user->rights->user->user->lire || $user->admin) - { - $menu->add_submenu(DOL_URL_ROOT."/user/", $langs->trans("List")); - } - - if($user->admin) + if ($user->rights->user->user->lire || $user->admin) { - $menu->add_submenu(DOL_URL_ROOT."/user/fiche.php?&action=create", $langs->trans("NewUser")); + $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Users")); + $menu->add_submenu(DOL_URL_ROOT."/user/", $langs->trans("List")); } - $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Groups")); - - if ($user->rights->user->user->lire || $user->admin) - { - $menu->add_submenu(DOL_URL_ROOT."/user/group/", $langs->trans("List")); - } - - if($user->admin) + if($user->rights->user->user->creer || $user->admin) { - $menu->add_submenu(DOL_URL_ROOT."/user/group/fiche.php?&action=create", $langs->trans("NewGroup")); + $menu->add_submenu(DOL_URL_ROOT."/user/fiche.php?&action=create", $langs->trans("NewUser")); + } + + if ($user->rights->user->user->lire || $user->admin) + { + $menu->add(DOL_URL_ROOT."/user/home.php", $langs->trans("Groups")); + $menu->add_submenu(DOL_URL_ROOT."/user/group/", $langs->trans("List")); + } + + if($user->rights->user->user->creer || $user->admin) + { + $menu->add_submenu(DOL_URL_ROOT."/user/group/fiche.php?&action=create", $langs->trans("NewGroup")); } - left_menu($menu->liste); + left_menu($menu->liste); } ?>