hotline #49515 : remove domain indexation on empty domains

VERSIONS_HOTLINE/49519

+ - ticket #49519 : don't launch domain indexation if no criteria selected
\ No newline at end of file

application/modules/admin/controllers/CatalogueController.php

@@ -41,6 +41,23 @@ class Admin_CatalogueController extends ZendAfi_Controller_Action {
     $this->view->titre = $this->_('Définition des domaines');
   }
 
+  protected function indexCatalog($catalogue,$requete) {
+    if (!defined('DEVELOPMENT'))
+      return true;
+    $page=0;
+    if ($catalogue->getIndexer()) {
+      if (stripos($requete,'where') ===false) {
+        $this->view->error = $this->_('Le domain ne ne peut pas etre indexé, il faut au moins un critère d\'indexation');
+        return false;
+      }
+
+      while ($catalogue->updateNoticesWithFacette(1000,$page)) {
+        $page++;
+      }
+    }
+  }
+
+
 
   public function testerAction()  {
     if (!$id_catalogue = (int)$this->_getParam("id_catalogue"))
@@ -56,15 +73,8 @@ class Admin_CatalogueController extends ZendAfi_Controller_Action {
             'notices' => ''];
 
     $ret = array_merge($ret, $catalogue->getTestCatalogue());
-    if (defined('DEVELOPMENT')) {
-      $page=0;
-      if ($catalogue->getIndexer()) {
-        while ($catalogue->updateNoticesWithFacette(1000,$page)) {
-          $page++;
-        }
-      }
-    }
 
+    $this->indexCatalog($catalogue,$ret['requete']);
     $this->view->requete = $ret["requete"];
     $this->view->temps_execution = $ret["temps_execution"] . " secs.";
     $this->view->nb_notices = $ret["nb_notices"];

application/modules/admin/views/scripts/catalogue/tester.phtml

 <?php
 if(Class_Users::isCurrentUserSuperAdmin()) echo '<p style="font-weight:bold; font-size: 0.9em">'.$this->requete.'</p>';
+
+
+if($this->error) echo '<p align="center" class="error">'.$this->error.'.</p>';
+
 if(!$this->notices) echo '<p align="center" class="error">Ce catalogue ne renvoie aucun résultat.</p>';
 else {
   echo $this->ligneInfos("Notices trouvées",$this->nb_notices);

tests/application/modules/admin/controllers/CatalogueControllerTest.php

@@ -544,6 +544,35 @@ class CatalogueControllerWithAModoBibWithRightAccesDomainesIndexTest extends Adm
 
 
 
+class CatalogueControllerActionTesterNoIndexationTest extends AbstractControllerTestCase {
+  protected $_storm_default_to_volatile = true;
+
+  protected function _loginHook($account) {
+    $account->ROLE_LEVEL = ZendAfi_Acl_AdminControllerRoles::SUPER_ADMIN;
+  }
+
+  public function setUp() {
+    parent::setUp();
+
+    $this->fixture('Class_Matiere',
+                   ['id' => 78308]);
+
+    $this->fixture('Class_Catalogue',
+                   ['id' => 6,
+                    'libelle' => 'nouveautés',
+                    'type_doc' => '',
+                    'indexer' =>true]);
+
+    $this->dispatch('admin/catalogue/tester/id_catalogue/6', true);
+  }
+
+/** @test */
+  public function withNoCriteriaShouldDisplayNoIndexationPossible() {
+    $this->assertXPathContentContains('//p[@class="error"]','Le domain ne ne peut pas etre indexé, il faut au moins un critère d\'indexation');
+  }
+
+}
+
 
 class CatalogueControllerActionTesterTest extends AbstractControllerTestCase {
   protected function _loginHook($account) {