diff --git a/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php b/library/ZendAfi/View/Helper/Admin/MenuGaucheAdmin.php index 0096eca45ea1ef121986fb0712cef73f9c2a78e3..277f0d9376d571bcc602825999545cf7f73d5664 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 5d8e5328f0e29b0e17aeb2d2c1a827543d19c46e..652d3ed1fe7d528477d6eed0bb9764b73ce61aea 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()); }