From f4fa55930560ce5b3e565811f143f5abf6056632 Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@afi-sa.fr>
Date: Sat, 19 Mar 2016 11:03:40 +0100
Subject: [PATCH] dev #40126 add opening filter in library widget configuration
---
VERSIONS_WIP/40126 | 1 +
library/Class/Systeme/ModulesAccueil/Library.php | 4 +++-
.../admin/controllers/AccueilControllerTest.php | 12 +++++++++---
.../modules/opac/controllers/BibControllerTest.php | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
create mode 100644 VERSIONS_WIP/40126
diff --git a/VERSIONS_WIP/40126 b/VERSIONS_WIP/40126
new file mode 100644
index 00000000000..1d827786465
--- /dev/null
+++ b/VERSIONS_WIP/40126
@@ -0,0 +1 @@
+ - ticket #40126 : Story 4 / bibliothèque : rechercher une bibliothèque avec filtres : demande fille
\ No newline at end of file
diff --git a/library/Class/Systeme/ModulesAccueil/Library.php b/library/Class/Systeme/ModulesAccueil/Library.php
index 60fe1623a39..48279bf6a08 100644
--- a/library/Class/Systeme/ModulesAccueil/Library.php
+++ b/library/Class/Systeme/ModulesAccueil/Library.php
@@ -100,7 +100,9 @@ class Class_Systeme_ModulesAccueil_Library extends Class_Systeme_ModulesAccueil_
public function getFiltersModes() {
- return $this->_getCustomFields();
+ $filters = $this->_getCustomFields();
+ $filters['opening'] = $this->_('Ouverture');
+ return $filters;
}
diff --git a/tests/application/modules/admin/controllers/AccueilControllerTest.php b/tests/application/modules/admin/controllers/AccueilControllerTest.php
index 918bd2526c6..ce09deacd96 100644
--- a/tests/application/modules/admin/controllers/AccueilControllerTest.php
+++ b/tests/application/modules/admin/controllers/AccueilControllerTest.php
@@ -1207,7 +1207,7 @@ class AccueilControllerLibraryConfigTest extends Admin_AbstractControllerTestCas
'id_module' => 32,
'preferences' => ['titre' => 'Médiathèque',
'libraries' => '45',
- 'filters' => 'custom_field_7']]);
+ 'filters' => 'custom_field_7;opening']]);
$this->dispatch('/admin/accueil/library/config/accueil/type_module/LIBRARY/id_module/32', true);
}
@@ -1265,8 +1265,14 @@ class AccueilControllerLibraryConfigTest extends Admin_AbstractControllerTestCas
/** @test */
- public function customField7ShouldBeSelected() {
- $this->assertXPath('//input[@name="filters"][@value="custom_field_7"]');
+ public function inputFiltersShouldContainsCustomFiledSevenAndOpening() {
+ $this->assertXPath('//input[@name="filters"][@value="custom_field_7;opening"]');
+ }
+
+
+ /** @test */
+ public function availableLabelsShouldContainsLiForOpening() {
+ $this->assertXPathContentContains('//ul/li[@data-value="opening"]', 'Ouverture');
}
diff --git a/tests/application/modules/opac/controllers/BibControllerTest.php b/tests/application/modules/opac/controllers/BibControllerTest.php
index bb4e4deecdf..419f54daa0a 100644
--- a/tests/application/modules/opac/controllers/BibControllerTest.php
+++ b/tests/application/modules/opac/controllers/BibControllerTest.php
@@ -882,8 +882,8 @@ abstract class BibControllerWidgetPageTestCase extends BibControllerWithThreeBib
-class BibControllerSelectionOrderDisplayTest extends BibControllerWidgetPageTestCase {
+class BibControllerSelectionOrderDisplayTest extends BibControllerWidgetPageTestCase {
public function setUp() {
parent::setUp();
$this->dispatch('/bib/widget-page/id_module/1/id_division/2/page/1', true);
--
GitLab