diff --git a/VERSIONS_HOTLINE/164279 b/VERSIONS_HOTLINE/164279 new file mode 100644 index 0000000000000000000000000000000000000000..2ae8df5d78a17821329f57742f0d2222509788b0 --- /dev/null +++ b/VERSIONS_HOTLINE/164279 @@ -0,0 +1 @@ + - correctif #164279 : Recherche : correction des libellés des facettes de domaines. \ No newline at end of file diff --git a/library/templates/Intonation/Library/Widget/Search/View.php b/library/templates/Intonation/Library/Widget/Search/View.php index bf94682f245fd436daf6551fa266fad9deb16073..b3927a5e3192d2e62e3e47963aba63bcad17a58c 100644 --- a/library/templates/Intonation/Library/Widget/Search/View.php +++ b/library/templates/Intonation/Library/Widget/Search/View.php @@ -370,13 +370,10 @@ abstract class IntonationSearchRenderAbstract { $options = ['' => $parent_facet->getLibelleFacette()]; foreach($domain_ids as $domain_id) { $domain = Class_Catalogue::find($domain_id); - if (!$facet = Storm_Query::from(Class_CodifThesaurus::class) - ->eq('libelle_facette', $domain->getLibelle()) - ->not_is_null('id_origine') - ->eq('code', Class_CodifThesaurusFixed::CODE_DOMAIN_FACET) - ->fetchFirst()) + if (!$facet = Class_CodifThesaurus::findFirstBy(['id_origine' => $domain_id, + 'code' => Class_CodifThesaurusFixed::CODE_DOMAIN_FACET])) continue; - $options[Class_CodifThesaurus::CODE_FACETTE . $facet->getIdThesaurus()] = $facet->getLibelleFacette(); + $options[Class_CodifThesaurus::CODE_FACETTE . $facet->getIdThesaurus()] = $domain->getLibelle(); } return $form->createElement('select', diff --git a/tests/scenarios/DynamicFacetOnDomains/DynamicFacetOnDomainsSearchWidgetTest.php b/tests/scenarios/DynamicFacetOnDomains/DynamicFacetOnDomainsSearchWidgetTest.php index b68d7046c07e03ab96cb9260cb46147de3084873..6c9e8c66c7457e17d6e083f44b4b015ffc108ece 100644 --- a/tests/scenarios/DynamicFacetOnDomains/DynamicFacetOnDomainsSearchWidgetTest.php +++ b/tests/scenarios/DynamicFacetOnDomains/DynamicFacetOnDomainsSearchWidgetTest.php @@ -89,7 +89,7 @@ class DynamicFacetOnDomainsSearchWidgetConfigurationPostTest -class DynamicFacetOnDomainsSearchWidgetWithFacetsTest extends AbstractControllerTestCase { +abstract class DynamicFacetOnDomainsSearchWidgetWithFacetsTestCase extends AbstractControllerTestCase { public function setUp() { parent::setUp(); @@ -116,8 +116,17 @@ class DynamicFacetOnDomainsSearchWidgetWithFacetsTest extends AbstractController 'libelle_facette' => 'Numérique', 'id_origine' => 2 ]); + } +} + - $this->dispatch('/index/index/id_profil/4'); + +class DynamicFacetOnDomainsSearchWidgetWithFacetsTest + extends DynamicFacetOnDomainsSearchWidgetWithFacetsTestCase { + + public function setUp() { + parent::setUp(); + $this->dispatch('/index/index/id_profil/4'); } @@ -154,6 +163,27 @@ class DynamicFacetOnDomainsSearchWidgetWithFacetsTest extends AbstractController +class DynamicFacetOnDomainsSearchWidgetWithRenamedDomainsTest + extends DynamicFacetOnDomainsSearchWidgetWithFacetsTestCase { + + public function setUp() { + parent::setUp(); + Class_Catalogue::find(2)->setLibelle(' - Numérique'); + Class_Catalogue::find(3)->setLibelle(' - Papier'); + Class_Catalogue::find(4)->setLibelle(' - Pierre'); + $this->dispatch('/index/index/id_profil/4'); + } + + + /** @test */ + public function formRechercheShouldContainsSelectCustomMultifacetsHSUPPWithOptionsHSUPP0001_HSUPP0002_Supports() { + $this->assertXPath('//div[@id="boite_1"]//select[@name="custom_multifacets_HSUPP"]/option[@value="HSUPP0001"][text()=" - Papier"]/following-sibling::option[@value="HSUPP0002"][text()=" - Numérique"]'); + } +} + + + + class DynamicFacetOnDomainsSearchWidgetConfigurationDisabledTest extends DynamicFacetOnDomainsSearchWidgetConfigurationTestCase {