Merge branch 'hotline#35768_footer_select_profil_admin_tool' into 'stable'

Hotline#35768 footer select profil admin tool

See merge request !1419

VERSIONS_HOTLINE/35768

+ - ticket #35768 : Correction du sélecteur de profil dans les outils d'adminitration situés en bas de page

library/ZendAfi/Form/Decorator/ComboProfils.php

@@ -25,8 +25,7 @@ class ZendAfi_Form_Decorator_ComboProfils extends Zend_Form_Decorator_Abstract {
     return $content
       . $this->_element->getView()
                        ->comboProfils($this->_element->getProfil(),
-                                      $this->_element->profil_filter
-                                      );
+                                      $this->_element->profil_filter);
   }
 }
 ?>
\ No newline at end of file

library/ZendAfi/View/Helper/ComboProfils.php

@@ -28,11 +28,13 @@ class ZendAfi_View_Helper_ComboProfils extends ZendAfi_View_Helper_BaseHelper {
     $_id_zone,
     $_id_bib;
 
-  public function comboProfils($id_zone='ALL', $id_bib='ALL', $id_profil=1,
-                               $autoload=false, $empty_option=false)  {
+
+  public function comboProfils($id_zone='ALL', $id_bib='ALL', $id_profil = 1, $autoload=false, $empty_option=false) {
     $this->_select_profil_id = $id_profil;
+
     if ($empty_option)
       $this->addEmptyOption();
+
     $this->_id_zone = 'ALL';
     $this->_id_bib = 'ALL';
 
@@ -73,7 +75,7 @@ class ZendAfi_View_Helper_ComboProfils extends ZendAfi_View_Helper_BaseHelper {
 
     $extra = '';
     if ($autoload)
-      $extra = ' onchange="window.location=\''. Class_Url::baseUrl() . '?id_profil=\' + this.value"';
+      $extra = ' onchange="window.location=\''. $this->getProfilUrl() . '\' + this.value"';
 
     return sprintf('<label for="%s" style="display:none">'.
                    $this->view->_('Profil').
@@ -86,6 +88,11 @@ class ZendAfi_View_Helper_ComboProfils extends ZendAfi_View_Helper_BaseHelper {
   }
 
 
+  protected function getProfilUrl() {
+    return  $this->view->url(['id_profil' => ''], null, true);
+  }
+
+
   public function getProfilsByBib() {
     return Class_Profil::getProfilsByBib($this->_id_zone, $this->_id_bib);
   }

tests/application/modules/opac/controllers/IndexControllerTest.php

@@ -124,7 +124,13 @@ class IndexControllerAsAdminWithCssEditorAndNoHeaderCss extends IndexControllerA
 
   /** @test */
   public function comboProfilOnChangeShouldContainsBaseUrl() {
-    $this->assertXPath('//div[@class="footer"]//select[@id="select_clef_profil"][contains(@onchange, "' . Class_Url::baseUrl() . '?id_profil=")]');
+    $this->assertXPath('//div[@class="footer"]//select[@id="select_clef_profil"][contains(@onchange, "\'/index/index/id_profil/\' + this.value")]');
+  }
+
+
+  /** @test */
+  public function comboProfilCurrentProfilShouldBeOne() {
+    $this->assertXPath('//div[@class="footer"]//select[@id="select_clef_profil"]//option[@value="1"][@selected="selected"]');
   }
 }