From 60bba0dbeff4c5ac4aef5dfb0906e594691d5f23 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@git-test.afi-sa.fr>
Date: Mon, 10 Jun 2013 16:24:51 +0000
Subject: [PATCH] Activation des groupes pour tout le monde
---
.../admin/controllers/UsergroupController.php | 21 +++++++++++--------
.../View/Helper/Admin/MenuGaucheAdmin.php | 4 +---
2 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/application/modules/admin/controllers/UsergroupController.php b/application/modules/admin/controllers/UsergroupController.php
index 6497ce513f6..51a8b93d5e9 100644
--- a/application/modules/admin/controllers/UsergroupController.php
+++ b/application/modules/admin/controllers/UsergroupController.php
@@ -136,16 +136,19 @@ class Admin_UsergroupController extends Zend_Controller_Action {
['legend' => $this->view->_('Filtre')]);
$this->displayGroupFiltreVisibleOnlyOnDynamicGroup();
-
- if (Class_AdminVar::isFormationEnabled()) {
- $form
- ->addElement('multiCheckbox',
- 'rights',
- ['label' => '',
- 'multiOptions' => Class_UserGroup::getRightDefinitionList()])
- ->addDisplayGroup(['rights'], 'rights_group', ['legend' => $this->view->_('Droits')]);
- }
+ $rights = Class_UserGroup::getRightDefinitionList();
+ if (!Class_AdminVar::isFormationEnabled()) {
+ unset($rights[Class_UserGroup::RIGHT_SUIVRE_FORMATION]);
+ unset($rights[Class_UserGroup::RIGHT_DIRIGER_FORMATION]);
+ }
+
+ $form
+ ->addElement('multiCheckbox',
+ 'rights',
+ ['label' => '',
+ 'multiOptions' => $rights])
+ ->addDisplayGroup(['rights'], 'rights_group', ['legend' => $this->view->_('Droits')]);
if (Class_AdminVar::isMultimediaEnabled()) {
diff --git a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
index 958f91194a2..d33caf9a254 100644
--- a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
+++ b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
@@ -108,9 +108,7 @@ class ZendAfi_View_Helper_Admin_MenuGaucheAdmin extends ZendAfi_View_Helper_Base
$menu_portail .= $this->addMenu("bibliotheques_16.png", $this->translate()->_("Bibliothèques"), "/admin/bib", $acl_admins);
$menu_portail .= $this->addMenu("utilisateurs_16.png", $this->translate()->_("Utilisateurs"), "/admin/users", $acl_admins);
- if (Class_AdminVar::isFormationEnabled() || Class_AdminVar::isMultimediaEnabled()) {
- $menu_portail .= $this->addMenu("groupes_16.png", $this->translate()->_("Groupes"), "/admin/usergroup", $acl_admins);
- }
+ $menu_portail .= $this->addMenu("groupes_16.png", $this->translate()->_("Groupes"), "/admin/usergroup", $acl_admins);
if (Class_AdminVar::isMultimediaEnabled()) {
$menu_portail .= $this->addMenu('postes_16.png', $this->view->_('Multimedia'), '/admin/multimedia', $acl_admins_portail);
--
GitLab