From 6bfb91f9df69c887643d0f1ae925595c365da10e Mon Sep 17 00:00:00 2001
From: Katrin Fischer <Katrin.Fischer.83@web.de>
Date: Fri, 17 May 2013 21:12:05 +0200
Subject: [PATCH] Bug 9824: Make it possible to apply/cancel switch

Using another existing string 'Apply filter' we are now
able to cancel the filter... and apply it... and cancel it
again... and so on.

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
(cherry picked from commit 7acdcb7e2aedf2ff202c009ce053de6dff54e840)

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
---
 acqui/booksellers.pl                                      | 1 +
 .../intranet-tmpl/prog/en/modules/acqui/booksellers.tt    | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/acqui/booksellers.pl b/acqui/booksellers.pl
index 118034bc5b..6db0bad527 100755
--- a/acqui/booksellers.pl
+++ b/acqui/booksellers.pl
@@ -151,5 +151,6 @@ $template->param(
     supplier       => ( $booksellerid || $supplier ),
     count          => $supplier_count,
 );
+$template->{VARS}->{'allbaskets'} = $allbaskets;
 
 output_html_with_http_headers $query, $cookie, $template->output;
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
index 40642313ba..006980c28d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt
@@ -62,7 +62,13 @@ $(document).ready(function() {
         </select>
         </p>
     [% END %]
-    <p><a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&booksellerid=[% booksellerid %]&allbaskets=1">Cancel filter</a></p>
+    <p>
+    [% IF ( allbaskets ) %]
+        <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&booksellerid=[% booksellerid %]">Apply filter</a>
+    [% ELSE %]
+        <a href="/cgi-bin/koha/acqui/booksellers.pl?supplier=[% supplier %]&booksellerid=[% booksellerid %]&allbaskets=1">Cancel filter</a>
+    [% END %]
+    </p>
     <div id="acqui_order_supplierlist">
         [% FOREACH supplier IN loop_suppliers %]
             <div class="supplier">
-- 
2.39.5