rel #27974 : search extension not displayed without terms

library/Class/CriteresRecherche.php

@@ -547,6 +547,11 @@ class Class_CriteresRecherche {
   }
 
 
+  public function hasExpressionRecherche() {
+    return !in_array($this->getExpressionRecherche(), ['', '*']);
+  }
+
+
   public function getUrlRetourRechercheInitiale(){
     $action = 'avancee';
     if (array_key_exists('expressionRecherche',$this->_params) || array_key_exists('id_panier',$this->_params) || array_key_exists('id_catalogue',$this->_params))

library/ZendAfi/View/Helper/TagSearchExtension.php

@@ -21,28 +21,40 @@
 
 
 class ZendAfi_View_Helper_TagSearchExtension extends ZendAfi_View_Helper_BaseHelper {
-  protected $_criteres_recherche, $_config;
+  protected $_criteres, $_config;
 
-  public function tagSearchExtension($criteres_recherche) {
-    if (!$this->_config = json_decode(Class_AdminVar::get('SEARCH_ALSO_IN'), true))
-      return '';
-
-    $this->_criteres_recherche = $criteres_recherche;
+  public function tagSearchExtension($criteres) {
+    $this->_config = json_decode(Class_AdminVar::get('SEARCH_ALSO_IN'), true);
+    $this->_criteres = $criteres;
 
-    $html = [];
-    foreach ($this->_config['site_label'] as $k => $site_label)
-      $html[] = $this->_renderLink($k, $site_label);
+    if (!$this->_shouldDisplay())
+      return '';
 
-    $html = array_filter($html);
+    $this->_criteres = $criteres;
+    $links = $this->_renderLinks();
 
-    return $html ?
+    return $links ?
       $this->_tag('div',
-                  $this->_('Rechercher aussi sur ') . implode('', $html),
+                  $this->_('Rechercher aussi sur ') . implode('', $links),
                   ['class' => 'search_extensions'])
       : '';
   }
 
 
+  protected function _shouldDisplay() {
+    return $this->_config && $this->_criteres->hasExpressionRecherche();
+  }
+
+
+  protected function _renderLinks() {
+    $links = [];
+    foreach ($this->_config['site_label'] as $k => $site_label)
+      $links[] = $this->_renderLink($k, $site_label);
+
+    return array_filter($links);
+  }
+
+
   protected function _renderLink($k, $site_label) {
     $site_url = $this->_config['site_url'][$k];
     if (!$site_url || !$site_label)
@@ -55,6 +67,6 @@ class ZendAfi_View_Helper_TagSearchExtension extends ZendAfi_View_Helper_BaseHel
 
 
   protected function _injectSearchTerm($url) {
-    return sprintf($url, $this->_criteres_recherche->getExpressionRecherche());
+    return sprintf($url, $this->_criteres->getExpressionRecherche());
   }
 }
\ No newline at end of file

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

@@ -132,4 +132,27 @@ class RechercheControllerSearchExtensionEnabledTest
   public function shouldNotDisplayIncompletLink() {
     $this->assertNotXPathContentContains('//a', 'Incomplete');
   }
+}
+
+
+
+class RechercheControllerSearchExtensionWithoutTermsTest extends AbstractControllerTestCase {
+  protected $_storm_default_to_volatile = true;
+
+  public function setUp() {
+    parent::setUp();
+
+    $this->fixture('Class_AdminVar',
+                   ['id' => 'SEARCH_ALSO_IN',
+                    'valeur' => json_encode(['site_label' => ['Jumel'],
+                                             'site_url' => ['http://www.jumel39.fr/rechercher?search_api_views_fulltext=%s']])]);
+
+    $this->dispatch('/opac/recherche/simple?type_doc=&tri=*&expressionRecherche=', true);
+  }
+
+
+  /** @test */
+  public function shouldNotContainsExtensionLinks() {
+    $this->assertNotXPathContentContains('//*', 'Rechercher aussi sur');
+  }
 }
\ No newline at end of file