Attachment 18221 Details for Bug 9824 – [SIGNED-OFF] Bug 9824: Make it possible to apply/cancel switch

[patch] [SIGNED-OFF] Bug 9824: Make it possible to apply/cancel switch

SIGNED-OFF-Bug-9824-Make-it-possible-to-applycance.patch (text/plain), 2.03 KB, created by Owen Leonard on 2013-05-17 19:27:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2013-05-17 19:27:17 UTC

Size: 2.03 KB

patch

obsolete

>From 0829f03eef5103339d3f74cf9a300f05cda3277e 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] [SIGNED-OFF] Bug 9824: Make it possible to apply/cancel
> switch
>Content-Type: text/plain; charset="utf-8"
>
>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>
>---
> acqui/booksellers.pl                               |    1 +
> .../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 118034b..6db0bad 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 4064231..006980c 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">
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 9824: 16168 | 16639 | 18168 | 18184 | 18214 | 18215 | 18219 | 18220 | 18221 | 18311 | 18312 | 18313 | 18332 | 18336 | 18348 | 18506