diff --git a/application/controllers/DashboardController.php b/application/controllers/DashboardController.php index b368cdd8f..69c914185 100644 --- a/application/controllers/DashboardController.php +++ b/application/controllers/DashboardController.php @@ -26,8 +26,8 @@ class DashboardController extends Zend_Controller_Action 'url' => $this->view->url(array('action'=>'clients')), ), 1 => array( - 'libelle' => 'Créer un client', - 'url' => $this->view->url(array('action'=>'client')), + 'libelle' => 'Créer un client', + 'url' => $this->view->url(array('action'=>'client')), ), 2 => array( 'libelle' => 'Gestion des commandes', diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php index 83aa65696..e650e1438 100644 --- a/application/controllers/UserController.php +++ b/application/controllers/UserController.php @@ -156,9 +156,15 @@ class UserController extends Zend_Controller_Action || $identity->profil == 'SuperAdministrateur') { $isAdmin = true; } - $this->view->assign('isAdmin', $isAdmin); + $isSuperAdmin = false; + if ($identity->profil == 'SuperAdministrateur') { + $isSuperAdmin = true; + } + $this->view->assign('isSuperAdmin', $isSuperAdmin); + Zend_Registry::get('firebug')->info('LOG:'.$isSuperAdmin); + Zend_Registry::get('firebug')->info('action'.$action); if ($op=='new'){ Zend_Registry::get('firebug')->info('Gestion first user SD'); diff --git a/application/views/default/scripts/dashboard/client.phtml b/application/views/default/scripts/dashboard/client.phtml index 87d1cb152..9c0ed0c1c 100644 --- a/application/views/default/scripts/dashboard/client.phtml +++ b/application/views/default/scripts/dashboard/client.phtml @@ -20,7 +20,7 @@ div.submit{ var droits = new Array(); droits = {wsdroits as $droit){ - echo '"'.$droit->code.'": "'.$droit->desc.'", '; + echo '"'.strtolower($droit->code).'": "'.$droit->desc.'", '; } ?>} @@ -374,11 +374,13 @@ if (!empty($text_droit)){ } ?> + + - wsdroits as $droit){ - $value = $droit->code; + $value = strtolower($droit->code); $text = $droit->desc; ?> diff --git a/application/views/default/scripts/user/index.phtml b/application/views/default/scripts/user/index.phtml index fecfc18ec..fcd1b76ee 100644 --- a/application/views/default/scripts/user/index.phtml +++ b/application/views/default/scripts/user/index.phtml @@ -85,7 +85,6 @@ if (in_array($this->options->profil, array('Administrateur', 'SuperAdministrateu echo $this->action('conso', 'user'); } ?> - Moteur de recherche @@ -94,9 +93,8 @@ if (in_array($this->options->profil, array('Administrateur', 'SuperAdministrateu Résultats par page - +Type de profil +isSuperAdmin){ ?> + + options->profil == $profil){ + $select = ' selected'; + } + ?> + >=$item?> + + + + =$this->options->profil?> + Droits d'accès