Attachment 134722 Details for Bug 30695 – Bug 30695: (QA follow-up) Catch moremember.tt too

[patch] Bug 30695: (QA follow-up) Catch moremember.tt too

Bug-30695-QA-follow-up-Catch-moremembertt-too.patch (text/plain), 9.26 KB, created by Martin Renvoize (ashimema) on 2022-05-06 11:22:54 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-05-06 11:22:54 UTC

Size: 9.26 KB

patch

obsolete

>From a0aeb34e4616892e03c3319299982201f507e1d3 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 6 May 2022 12:19:36 +0100
>Subject: [PATCH] Bug 30695: (QA follow-up) Catch moremember.tt too
>
>This patch does the same treatment for moremember.tt where the same
>summary block is includes. We also correct the tab order to be a little
>more consistent too.
>
>We should really move this to an include and refer to it from both
>templates instead of this copy/paste code..
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> .../prog/en/modules/circ/circulation.tt       |  4 +-
> .../prog/en/modules/members/moremember.tt     | 55 +++++++++----------
> 2 files changed, 28 insertions(+), 31 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>index de00bc3213..f7cd93de71 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt
>@@ -841,7 +841,9 @@
>                             </li>
>                         [% END %]
> 
>-                        <li><a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.count || 0 | html %])</a></li>
>+                        <li>
>+                            <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.count || 0 | html %])</a>
>+                        </li>
> 
>                         [% SET enrollments = patron.get_club_enrollments %]
>                         [% SET enrollable  = patron.get_enrollable_clubs(0) %] 
>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 292f754c04..3063cad1b2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt
>@@ -633,11 +633,11 @@
>                     <div id="finesholdsissues" class="toptabs">
>                         <ul>
>                             <li>
>-                                <a href="#checkouts">[% issuecount | html %] Checkout(s)</a>
>+                                <a href="#checkouts">Checkouts ([% issuecount || 0 | html %])</a>
>                             </li>
>                             [% IF relatives_issues_count %]
>                                 <li>
>-                                    <a href="#relatives-issues" id="relatives-issues-tab">[% relatives_issues_count | html %] Relatives' checkouts</a>
>+                                    <a href="#relatives-issues" id="relatives-issues-tab">Relatives' checkouts ([% relatives_issues_count | html %])</a>
>                                 </li>
>                             [% END %]
>                             [% IF ( fines ) %]
>@@ -647,17 +647,20 @@
>                             [% END %]
>                             [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>                                 <li>
>-                                    [% IF ( holds_count ) %]
>-                                        <a href="#reserves" id="holds-tab">[% holds_count | html %] Hold(s)</a>
>-                                    [% ELSE %]
>-                                        <a href="#reserves" id="holds-tab">0 Holds</a>
>-                                    [% END %]
>+                                        <a href="#reserves" id="holds-tab">Holds ([% holds_count || 0 | html %])</a>
>+                                </li>
>+                            [% END %]
>+
>+                            [% IF Koha.Preference('UseRecalls') %]
>+                                <li>
>+                                    <a href="#recalls" id="recalls-tab">Recalls ([% recalls.count || 0 | html %])</a>
>                                 </li>
>                             [% END %]
>+
>                             [% IF Koha.Preference('ArticleRequests') %]
>                                 [% SET article_requests = Context.Scalar( Context.Scalar( patron, 'article_requests' ), 'filter_by_current') %]
>                                 <li>
>-                                    <a href="#article-requests" id="article-requests-tab"> [% article_requests.count | html %] Article requests</a>
>+                                    <a href="#article-requests" id="article-requests-tab">Article requests ([% article_requests.count || 0 | html %])</a>
>                                 </li>
>                             [% END %]
> 
>@@ -665,8 +668,8 @@
>                                 <li>
>                                     [% IF ( patron.return_claims.count ) %]
>                                         <a href="#return-claims" id="return-claims-tab">
>-                                            Claim(s)
>-                                            [% IF patron.return_claims.resolved.count == 0 %]
>+                                            Claims
>+                                            ([% IF patron.return_claims.resolved.count == 0 %]
>                                                 <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
>                                             [% ELSE %]
>                                                 <span title="Resolved claims" class="label label-success" id="return-claims-count-resolved">[% patron.return_claims.resolved.count | html %]</span>
>@@ -675,22 +678,22 @@
>                                                 <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
>                                             [% ELSE %]
>                                                 <span title="Unresolved claims" class="label label-warning" id="return-claims-count-unresolved">[% patron.return_claims.unresolved.count | html %]</span>
>-                                            [% END %]
>-
>+                                            [% END %])
>                                         </a>
>                                     [% ELSE %]
>                                         <a href="#return-claims" id="return-claims-tab">
>-                                            Claim(s)
>-                                            <span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
>-                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>
>+                                            Claims
>+                                            (<span title="Resolved claims" class="label label-default" id="return-claims-count-resolved">0</span>
>+                                            <span title="Unresolved claims" class="label label-default" id="return-claims-count-unresolved">0</span>)
>                                         </a>
>                                     [% END %]
>                                 </li>
>                             [% END %]
> 
>                             <li>
>-                                <a id="debarments-tab-link" href="#reldebarments">[% debarments.size | html %] Restrictions</a>
>+                                <a id="debarments-tab-link" href="#reldebarments">Restrictions ([% debarments.size || 0 | html %])</a>
>                             </li>
>+
>                             [% SET enrollments = patron.get_club_enrollments %]
>                             [% SET enrollable  = patron.get_enrollable_clubs(0) %] 
>                             [% IF CAN_user_clubs && ( enrollable.count || enrollments.count ) %]
>@@ -700,14 +703,6 @@
>                                     </a>
>                                 </li>
>                             [% END %]
>-
>-                            [% IF Koha.Preference('UseRecalls') %]
>-                                <li>
>-                                    <a href="#recalls" id="recalls-tab">
>-                                        [% recalls.count | html %] Recalls
>-                                    </a>
>-                                </li>
>-                            [% END %]
>                         </ul>
> 
>                         [% INCLUDE "checkouts-table.inc" %]
>@@ -730,12 +725,6 @@
>                             </div>
>                         [% END %]
> 
>-                        [% IF Koha.Preference('UseRecalls') %]
>-                            <div id="recalls">
>-                                [% INCLUDE 'recalls.inc' %]
>-                            </div>
>-                        [% END %]
>-
>                         [% INCLUDE borrower_debarments.inc %]
> 
>                         [% IF ( CAN_user_circulate_circulate_remaining_permissions ) %]
>@@ -808,6 +797,12 @@
>                             </div> [% # /div#reserves %]
>                         [% END %]
> 
>+                        [% IF Koha.Preference('UseRecalls') %]
>+                            <div id="recalls">
>+                                [% INCLUDE 'recalls.inc' %]
>+                            </div>
>+                        [% END %]
>+
>                         [% IF Koha.Preference('ClaimReturnedLostValue') %]
>                             [% INCLUDE 'patron-return-claims.inc' %]
>                         [% END %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 30695: 134650 | 134657 | 134721 | 134722 | 135053