Attachment 51603 Details for Bug 16478 – [PASSED QA] Bug 16478: Fix checkout history tabs - intranet

[patch] [PASSED QA] Bug 16478: Fix checkout history tabs - intranet

PASSED-QA-Bug-16478-Fix-checkout-history-tabs---in.patch (text/plain), 3.45 KB, created by Katrin Fischer on 2016-05-18 22:03:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2016-05-18 22:03:55 UTC

Size: 3.45 KB

patch

obsolete

>From 8d091b17376679968d520893e10a56ea2246f681 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Mon, 9 May 2016 17:59:52 +0100
>Subject: [PATCH] [PASSED QA] Bug 16478: Fix checkout history tabs - intranet
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Test plan:
>Same as before for the intranet.
>And please retest the OPAC => I have changed the filter's values to
>match OPAC/intranet
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Signed-off-by: Marc VÃ©ron <veron@veron.ch>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt  | 7 +++----
> koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt | 8 ++++----
> 2 files changed, 7 insertions(+), 8 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>index 2937e15..5f2e1d8 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt
>@@ -88,11 +88,10 @@
>       [% FOREACH issue IN loop_reading %]
>         [% IF  issue.returndate  %]<tr>[% ELSE %]<tr class="onissue">[% END %]
>           <td style="display:none;">
>-            [% IF issue.onsite_checkout %]
>-              onsite_checkout
>-            [% ELSE %]
>-              standard_checkout
>+            [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' %]
>+            [% ELSE %][% issuetype = 'standard_checkout' %]
>             [% END %]
>+            [% issuetype %]
>           </td>
>           <td>
>             <span title="[% issue.issuestimestamp %]">[% issue.issuestimestamp | $KohaDates with_hours => 1 %]</span>
>diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
>index 19bbe49..c4a7419 100644
>--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
>+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-readingrecord.tt
>@@ -80,8 +80,8 @@
>                                             [% FOREACH issue IN READING_RECORD %]
>                                                 <tr>
>                                                     <td style="display:none;">
>-                                                      [% IF issue.onsite_checkout %][% issuetype = 'onsite' %]
>-                                                      [% ELSE %][% issuetype = 'checkout' %]
>+                                                      [% IF issue.onsite_checkout %][% issuetype = 'onsite_checkout' %]
>+                                                      [% ELSE %][% issuetype = 'standard_checkout' %]
>                                                       [% END %]
>                                                       [% issuetype %]
>                                                     </td>
>@@ -192,9 +192,9 @@
>             select: function(e, ui) {
>                 var id = $(ui.tab).attr("id");
>                 if ( id == "tab_checkout" ) {
>-                    table.fnFilter("checkout", 0);
>+                    table.fnFilter("standard_checkout", 0);
>                 } else if ( id == "tab_onsite_checkout" ) {
>-                    table.fnFilter("onsite", 0);
>+                    table.fnFilter("onsite_checkout", 0);
>                 } else { // all
>                     table.fnFilter('', 0);
>                 }
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 16478: 51334 | 51336 | 51337 | 51338 | 51342 | 51602 | 51603