From 56d6ec6dfc74029719ba3b778199a00f9161411e Mon Sep 17 00:00:00 2001
From: pbarroca <pbarroca@afi-sa.fr>
Date: Thu, 19 Nov 2015 11:12:10 +0100
Subject: [PATCH] rel #32494 : classic sitotheque menu item kept even if sito
 in album is activated

---
 library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php       | 3 +--
 .../modules/admin/controllers/IndexControllerTest.php       | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
index 0096eca45ea..277f0d9376d 100644
--- a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
+++ b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php
@@ -74,8 +74,7 @@ class ZendAfi_View_Helper_Admin_MenuGaucheAdmin extends ZendAfi_View_Helper_Base
                       $this->filterAdmin($this->user))
 
       .$this->addMenu("sitotheque_16.png",      $this->translate()->_("Sitothèque"),             "/admin/sito",
-                      !Class_AdminVar::isSitoInAlbums()
-                      && ($this->filterAdmin($this->user) || $this->user->hasRightToAccess(Class_UserGroup::RIGHT_USER_SITOTHEQUE)))
+                      $this->filterAdmin($this->user) || $this->user->hasRightToAccess(Class_UserGroup::RIGHT_USER_SITOTHEQUE))
 
       .$this->addMenu("moderation_16.png",      $this->translate()->_("Modération"),             "/admin/modo/",
                       $this->filterAll($this->user),
diff --git a/tests/application/modules/admin/controllers/IndexControllerTest.php b/tests/application/modules/admin/controllers/IndexControllerTest.php
index 5d8e5328f0e..652d3ed1fe7 100644
--- a/tests/application/modules/admin/controllers/IndexControllerTest.php
+++ b/tests/application/modules/admin/controllers/IndexControllerTest.php
@@ -124,9 +124,9 @@ class IndexControllerIndexSitothequeInAlbumsTest extends IndexControllerIndexSit
   }
 
   /** @test */
-  public function withSitoInAlbumsShouldNotDisplaySitothequeItemInContentManagerMenu() {
-    $this->assertNotXPathContentContains($this->_cms_menu_path . '//a', 'Sitothèque',
-                                         $this->_response->getBody());
+  public function withSitoInAlbumsShouldAlsoDisplaySitothequeItemInContentManagerMenu() {
+    $this->assertXPathContentContains($this->_cms_menu_path . '//a', 'Sitothèque',
+                                      $this->_response->getBody());
   }
 
 
-- 
GitLab