diff --git a/application/modules/admin/controllers/SearchFormController.php b/application/modules/admin/controllers/SearchFormController.php index f46bba0c9c283e85c09454b73b0ee5f32ea8cdbf..cda61785d8cb424dae58275772115306606383d8 100644 --- a/application/modules/admin/controllers/SearchFormController.php +++ b/application/modules/admin/controllers/SearchFormController.php @@ -28,13 +28,6 @@ class Admin_SearchFormController extends ZendAfi_Controller_Action { } - public function init() { - parent::init(); - if (!Class_AdminVar::get('ADVANCED_SEARCH_CONFIGURABLE')) - return $this->_redirect('/'); - } - - public function makevisibleAction() { if (!$search_form = Class_SearchForm::find((int)$this->_getParam('id'))) { $this->_redirect('admin/search-form'); diff --git a/library/Class/AdminVar.php b/library/Class/AdminVar.php index 02a8ece1883b3506ffa8e9f4dbd09c6b6e028ddc..298164d4b1802eb4722f45ab7a54aa95883760f5 100644 --- a/library/Class/AdminVar.php +++ b/library/Class/AdminVar.php @@ -246,7 +246,7 @@ class Class_AdminVarLoader extends Storm_Model_Loader { ['name' => 'site_url', 'label' => $this->_('Url de recherche')] ]]]), 'NOM_DOMAINE' => Class_AdminVar_Meta::newDefault($this->_('Nom de domaine principal de l\'OPAC, ex: monopac.macommune.fr')), - 'ADVANCED_SEARCH_CONFIGURABLE' => Class_AdminVar_Meta::newOnOff($this->_('Activer la recherche avancée configurable'))->bePrivate()]; + 'CUSTOM_SEARCH_FORM' => Class_AdminVar_Meta::newOnOff($this->_('Activer les formulaires de recherche configurables'))->bePrivate()]; } @@ -940,6 +940,11 @@ class Class_AdminVarLoader extends Storm_Model_Loader { return Class_AdminVar::isBibNumEnabled() && Class_AdminVar::get('SITO_IN_ALBUMS'); } + + + public function isCustomSearchFormEnabled() { + return Class_AdminVar::isModuleEnabled('CUSTOM_SEARCH_FORM'); + } } diff --git a/library/ZendAfi/Acl/AdminControllerGroup.php b/library/ZendAfi/Acl/AdminControllerGroup.php index b4ad5918688ca63d73a3ebaf49062f4b6810a4c6..ded4dadb2813292cf6625eacb4905e46256223ec 100644 --- a/library/ZendAfi/Acl/AdminControllerGroup.php +++ b/library/ZendAfi/Acl/AdminControllerGroup.php @@ -65,7 +65,8 @@ class ZendAfi_Acl_AdminControllerGroup { 'premier-chapitre' => Class_AdminVar::isPremierChapitreEnabled(), 'i18n' => Class_AdminVar::isTranslationEnabled(), 'stat/piwik' => (new Class_AdminVar_Piwik())->isEnabled(), - 'multimedia' => Class_AdminVar::isMultimediaEnabled()]; + 'multimedia' => Class_AdminVar::isMultimediaEnabled(), + 'search-form' => Class_AdminVar::isCustomSearchFormEnabled()]; } diff --git a/library/ZendAfi/View/Helper/Admin/ContentNav.php b/library/ZendAfi/View/Helper/Admin/ContentNav.php index c7a7e258adc5b05b843326360977f3a78f9398e8..b96bb6f5e9c5517fd4d53986b0739f166ae64a98 100644 --- a/library/ZendAfi/View/Helper/Admin/ContentNav.php +++ b/library/ZendAfi/View/Helper/Admin/ContentNav.php @@ -129,9 +129,6 @@ class ZendAfi_View_Helper_Admin_ContentNav extends ZendAfi_View_Helper_BaseHelpe public function menuSysteme() { $is_admin = function($user) { return $user->isAdmin(); }; $is_super_admin = function($user) { return $user->isSuperAdmin(); }; - $advanced_search_form = function($user) { - return Class_AdminVar::get('ADVANCED_SEARCH_CONFIGURABLE'); - }; return $this ->renderBloc($this->_('Système'), [['cosmogramme', $this->_('Accès à Cosmogramme'), '/cosmogramme', @@ -154,7 +151,7 @@ class ZendAfi_View_Helper_Admin_ContentNav extends ZendAfi_View_Helper_BaseHelpe [], function($user) { return defined('DEVELOPMENT') && $user->isAdmin();}], ['filebrowser', $this->_('Explorateur de fichiers'), '/admin/file-manager'], - ['customfields', $this->_('Formulaires de recherche avancée'), '/admin/search-form', [], $advanced_search_form], + ['customfields', $this->_('Formulaires de recherche configurables'), '/admin/search-form'], ['customfields', $this->_('Champs personnalisés'), '/admin/custom-fields/index', [], $is_admin], ['customreports', $this->_('Rapports statistiques'), '/admin/custom-fields-report', [], $is_admin] @@ -299,4 +296,4 @@ class ZendAfi_View_Helper_Admin_MenuGaucheAdminItem { ? static::$_acl : static::$_acl = new ZendAfi_Acl_AdminControllerGroup(); } -} \ No newline at end of file +} diff --git a/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php b/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php index 4f2d1df68a1e76795d35b2082372bf6ebf8d7692..866974ff2c7544dffe629a3af478682ab76c3bba 100644 --- a/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php +++ b/tests/scenarios/AdvancedSearch/AdminConfigurationTest.php @@ -25,14 +25,20 @@ class AdvancedSearch_AdminConfigurationUnactiveTest extends Admin_AbstractCont public function setUp() { parent::setUp(); - Class_AdminVar::set('ADVANCED_SEARCH_CONFIGURABLE', 0); + Class_AdminVar::set('CUSTOM_SEARCH_FORM', 0); + } + + + public function tearDown() { + ZendAfi_View_Helper_Admin_MenuGaucheAdminItem::setAcl(null); + parent::tearDown(); } /** @test */ public function menuAdvancedFormShouldBeDisplayed() { $this->dispatch('/admin'); - $this->assertNotXPathContentContains('//ul[@class="menuAdmin"]//li', 'Formulaires de recherche avancée'); + $this->assertNotXPathContentContains('//ul[@class="menuAdmin"]//li', 'Formulaires de recherche configurables'); } @@ -50,7 +56,7 @@ class AdvancedSearch_ActiveTestCase extends Admin_AbstractControllerTestCase { public function setUp() { parent::setUp(); - Class_AdminVar::set('ADVANCED_SEARCH_CONFIGURABLE', 1); + Class_AdminVar::set('CUSTOM_SEARCH_FORM', 1); $this->fixture('Class_SearchForm', ['id' => 1, 'label' => 'Mon formulaire', @@ -58,6 +64,12 @@ class AdvancedSearch_ActiveTestCase extends Admin_AbstractControllerTestCase { 'visible' => true ]); } + + + public function tearDown() { + ZendAfi_View_Helper_Admin_MenuGaucheAdminItem::setAcl(null); + parent::tearDown(); + } } @@ -66,7 +78,8 @@ class AdvancedSearch_AdminConfigurationSimpleActiveTest extends AdvancedSearch_A /** @test */ public function menuAdvancedFormShouldBeDisplayed() { $this->dispatch('/admin'); - $this->assertXPathContentContains('//ul[@class="menuAdmin"]//li', 'Formulaires de recherche avancée'); + $this->assertXPathContentContains('//ul[@class="menuAdmin"]//li', + 'Formulaires de recherche configurables'); }