From 20390b4d1093eff1502ea6c319cf9f0e0aaae75c Mon Sep 17 00:00:00 2001
From: Laurent Laffont <llaffont@afi-sa.fr>
Date: Fri, 26 Oct 2018 16:58:24 +0200
Subject: [PATCH] dev #80538 check clear form is present when several advanced
search forms exists
---
library/ZendAfi/View/Helper/AdvancedSearch.php | 3 ++-
tests/scenarios/AdvancedSearch/AdvancedSearchTest.php | 8 ++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/library/ZendAfi/View/Helper/AdvancedSearch.php b/library/ZendAfi/View/Helper/AdvancedSearch.php
index 2730d52313c..06434069005 100644
--- a/library/ZendAfi/View/Helper/AdvancedSearch.php
+++ b/library/ZendAfi/View/Helper/AdvancedSearch.php
@@ -107,7 +107,8 @@ class ZendAfi_View_Helper_AdvancedSearch extends ZendAfi_View_Helper_BaseHelper
if(!$form_wrapper->isFormVisible())
$html = $this->_tag('p', $this->_('Ce formulaire n\'est pas visible.'), ['class' => 'error']) . $html;
- $html .= $this->view->renderForm($this->_populateForm($form_wrapper->getForm()));
+ $html .= $this->view->renderForm($this->_populateForm($form_wrapper->getForm()),
+ ['append' => [$this->_clearFormButton()]]);
$content[] = $html;
return $content;
diff --git a/tests/scenarios/AdvancedSearch/AdvancedSearchTest.php b/tests/scenarios/AdvancedSearch/AdvancedSearchTest.php
index 7001a6e1b4e..8e0a297e2e9 100644
--- a/tests/scenarios/AdvancedSearch/AdvancedSearchTest.php
+++ b/tests/scenarios/AdvancedSearch/AdvancedSearchTest.php
@@ -174,8 +174,6 @@ class AdvancedSearchTest extends AdvancedSearchTestCase {
class AdvancedSearchWithCustomFormDefaultTest extends AdvancedSearchTest {
-
-
protected function _prepareFixtures() {
parent::_prepareFixtures();
Class_AdminVar::set('CUSTOM_SEARCH_FORM', 1);
@@ -566,6 +564,12 @@ class AdvancedSearchValidCustomFormsSelectedAndPublishedTest
public function tabifyScriptShouldBePresent() {
$this->assertXPath('//script[contains(@src, "public/opac/js/tabify.js")]');
}
+
+
+ /** @test */
+ public function formShouldContainsResetButton() {
+ $this->assertXPathContentContains('//button[contains(@data-url,"/recherche/avancee/statut/reset")]', 'Réinitialiser');
+ }
}
--
GitLab