Attachment 99006 Details for Bug 6508 – Bug 6508: (follow-up) Remove dependency on jquery for check in templates

[patch] Bug 6508: (follow-up) Remove dependency on jquery for check in templates

Bug-6508-follow-up-Remove-dependency-on-jquery-for.patch (text/plain), 3.38 KB, created by Owen Leonard on 2020-02-14 18:31:48 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2020-02-14 18:31:48 UTC

Size: 3.38 KB

patch

obsolete

>From ef703c86503c386b2e66591602e9f15bac253995 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <katrin.fischer.83@web.de>
>Date: Fri, 14 Feb 2020 16:25:21 +0000
>Subject: [PATCH] Bug 6508: (follow-up) Remove dependency on jquery for check
> in templates
>
>Should work as before with the test plan from the second patch. But
>removes the added jQuery display control code in favor of checking
>if fines is set on template level.
>
>For several patrons with and without fines and with credits:
>- Check the Fines & Charges only display when there is something to see
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>---
> .../prog/en/modules/members/moremember.tt          | 28 +++++++++++-----------
> 1 file changed, 14 insertions(+), 14 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>index ced24808dcc..5a25050242d 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -699,9 +699,11 @@
>                                     <a href="#relatives-issues" id="relatives-issues-tab">[% relatives_issues_count | html %] Relatives' checkouts</a>
>                                 </li>
>                             [% END %]
>-                            <li id="finestab">
>-                                <a href="#finesandcharges">Fines &amp; Charges ([% fines | $Price %])</a>
>-                            </li>
>+                            [% IF ( fines ) %]
>+                                <li id="finestab">
>+                                    <a href="#finesandcharges">Fines &amp; Charges ([% fines | $Price %])</a>
>+                                </li>
>+                            [% END %]
>                             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>                                 <li>
>                                     [% IF ( holds_count ) %]
>@@ -753,13 +755,15 @@
> 
>                         [% INCLUDE "relatives-issues-table.inc" %]
> 
>-                        <div id="finesandcharges">
>-                            [% IF ( fines ) %]
>-                                <p>Total due: [% fines | $Price %]</p>
>-                            [% ELSE %]
>-                                <p>No outstanding charges</p>
>-                            [% END %]
>-                        </div>
>+                        [% IF ( fines ) %]
>+                            <div id="finesandcharges">
>+                                [% IF ( fines ) %]
>+                                    <p>Total due: [% fines | $Price %]</p>
>+                                [% ELSE %]
>+                                    <p>No outstanding charges</p>
>+                                [% END %]
>+                            </div>
>+                        [% END %]
> 
>                         [% IF CAN_user_clubs && ( enrollments.count || enrollable.count ) %]
>                             <div id="clubs-tab">
>@@ -888,10 +892,6 @@
>         columns_settings_issues_table = [% ColumnsSettings.GetColumns( 'members', 'moremember', 'issues-table', 'json' ) | $raw %]
> 
>         $(document).ready(function() {
>-            $("#finestab").hide();
>-            [% IF fines %]
>-                $("#finestab").show();
>-            [% END %]
> 
>             if ( $('#clubs-tab').length ) {
>                 $('#clubs-tab-link').on('click', function() {
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 6508: 4487 | 94601 | 98786 | 98787 | 98809 | 98810 | 98972 | 98973 | 98974 | 99004 | 99005 | 99006