fix facets order in search result

library/ZendAfi/View/Helper/Facettes.php

@@ -57,15 +57,17 @@ class ZendAfi_View_Helper_Facettes extends ZendAfi_View_Helper_BaseHelper {
 
   public function listeFacettesHTML($codes, $facets, $url) {
     $html = '';
-    foreach($facets as $type => $values) {
-      if ($codes and false === strpos($codes, $type))
+    $rubriques = Class_Notice_RubriqueFacette::parseRubriquesFromPreferenceField($codes);
+    foreach($rubriques as $rubrique) {
+      $type = $rubrique->getCode();
+      if (!isset($facets[$type]))
         continue;
 
-      $html .= $this
-        ->_tag('li',
-               $this->_tag('b', (new Class_Notice_RubriqueFacette($type))->getLibelle())
-               . $this->listeFacettesElementHTML($type, $values, $url),
-               ['class' => 'facette_titre']);
+
+      $html .= $this->_tag('li',
+                           $this->_tag('b', $rubrique->getLibelle())
+                           . $this->listeFacettesElementHTML($type, $facets[$type], $url),
+                           ['class' => 'facette_titre']);
     }
 
     return $this->_tag('ul', $html);

tests/library/ZendAfi/View/Helper/FacettesTest.php

@@ -100,7 +100,7 @@ abstract class ZendAfi_View_Helper_FacettesTestCase extends ViewHelperTestCase {
                           'A12168' => 6,
                           'A9875' => 5]],
 
-                 ['facettes_codes' => 'YMHGENRA',
+                 ['facettes_codes' => 'YAMHGENR',
                   'facettes_nombre' => 2],
 
                  new Class_CriteresRecherche(['expressionRecherche' => '*']));
@@ -129,9 +129,9 @@ class ZendAfi_View_Helper_FacettesRestrainedTest extends ZendAfi_View_Helper_Fac
 
 
   /** @test */
-  public function linkForFacetMaisonEnvironnementShouldBePresent() {
+  public function linkForFacetMaisonEnvironnementShouldBePresentAtSecondPosition() {
     $this->assertXPathContentContains($this->_html,
-                                      '//a[@class="facette"][contains(@href, "/recherche/simple/facette/YMDE")]',
+                                      '//div[@class="facette"]/ul/li[1]//ul//a[@class="facette"][contains(@href, "/recherche/simple/facette/YMDE")]',
                                       'Maison environnement');
   }
 
@@ -145,9 +145,9 @@ class ZendAfi_View_Helper_FacettesRestrainedTest extends ZendAfi_View_Helper_Fac
 
 
   /** @test */
-  public function linkForFacetMauriceHenryShouldBePresentInDisplayMoreFacets() {
+  public function linkForFacetMauriceHenryShouldBePresentInDisplayMoreFacetsAtThirdPosition() {
     $this->assertXPathContentContains($this->_html,
-                                      '//ul[@id="A_msg"]//a[@class="facette"][contains(@href, "/recherche/simple/facette/A6752")]',
+                                      '//div[@class="facette"]/ul/li[2]//ul[@id="A_msg"]//a[@class="facette"][contains(@href, "/recherche/simple/facette/A6752")]',
                                       'Maurice Henry');
   }