From 83da81e0ce2116bbcfd6581a58e3f50dbbfcc3f1 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@koha-community.org>
Date: Thu, 4 Jun 2015 16:28:08 +0200
Subject: [PATCH] Bug 14029: Provide 'clear' link to empty reports search
 filters
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Patch adds a 'clear' link next to the 'Apply filters' button to
empty out the form fields.

To test:
- go to the reports module
- make sure you have some saved reports
- search your saved reports using the author, keyword and date filters
- verify searching works as expected
- verify the new 'clear' link works as expected

Tested couner patch, followed test plan, works as expected. QA tools ok.
Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>
---
 .../prog/en/modules/reports/guided_reports_start.tt          | 5 ++++-
 reports/guided_reports.pl                                    | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
index e769af2a5c..283a1cf6ef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt
@@ -1045,7 +1045,10 @@ Sub report:<select name="subreport">
     <li><label for="filter_keyword">Keyword:</label> <input type="text" id="filter_keyword" name="filter_keyword" value="[% filters.keyword %]" /></li>
   </ol>
   </fieldset>
-  <fieldset class="action"><input type="submit" value="Apply filter" /></fieldset>
+  <fieldset class="action">
+    <input type="submit" value="Apply filter" />
+    <a id="resetReportsFilter" href="?phase=Use saved&clear_filters=1">Clear</a>
+  </fieldset>
 </form>
 </div>
 [% END %]
diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
index 0fb773f7f3..9cfa8ce9fe 100755
--- a/reports/guided_reports.pl
+++ b/reports/guided_reports.pl
@@ -77,7 +77,7 @@ if ( $input->param("filter_set") ) {
     $session->param('report_filter', $filter) if $session;
     $template->param( 'filter_set' => 1 );
 }
-elsif ($session) {
+elsif ($session and not $input->param('clear_filters')) {
     $filter = $session->param('report_filter');
 }
 
-- 
2.20.1