Attachment 134502 Details for Bug 21978 – Bug 21978: Use patron-title.inc in request.tt

[patch] Bug 21978: Use patron-title.inc in request.tt

Bug-21978-Use-patron-titleinc-in-requesttt.patch (text/plain), 16.29 KB, created by Martin Renvoize (ashimema) on 2022-05-03 10:54:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-05-03 10:54:09 UTC

Size: 16.29 KB

patch

obsolete

>From 822ee6ca803facb2fd93455ab739bd93e597289f Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Mon, 25 Apr 2022 12:14:29 +0100
>Subject: [PATCH] Bug 21978: Use patron-title.inc in request.tt
>
>This patch updates all manual accurences of the patron title display
>to use the patron-title.inc include (so we get middlename handling)
>in request.tt.
>
>We also add the option to hide the cardnumber from the include and set
>the link_to to 'members_pay' to retain the current display format on
>this page.
>
>Test plan
>You'll need to trigger the following cases to test all cases:
>1) Too many holds
>2) Account expired
>3) Has restrictions
>4) Outstanding fines
>5) Already has hold on item
>6) No holds allowed
>7) Too many holds for this record
>8) Already in possession
>9) Already has a hold
>10) Already has a recall
>11) Pickup library doesn't many patron home library
>---
> .../prog/en/includes/patron-title.inc | 4 +-
> .../prog/en/modules/reserve/request.tt | 42 +++++++++----------
> 2 files changed, 23 insertions(+), 23 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
>index d2b61aade6..d0a3267cf5 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc
>@@ -44,7 +44,8 @@
> [%- SET data.title = span_start _ data.title _ span_end _ ' ' -%]
> [%- END -%]
> [%- SET display_patron_name = 1 -%]
>-[%- SET display_cardnumber = 1 -%]
>+[%- SET display_cardnumber = 1 -%]
>+[%- IF no_cardnumber %][% SET display_cardnumber = 0 %][% END -%]
> [%- IF hide_patron_infos_if_needed %] [%# Should only be set if patron is set -%]
> [%- SET can_see_patron_infos = logged_in_user.can_see_patron_infos( patron ) -%]
> [%- UNLESS can_see_patron_infos -%]
>@@ -57,6 +58,7 @@
> [%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%]
> [%- IF link_to == 'circulation_reserves' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | uri %]#reserves">
> [%- ELSIF link_to == 'circulation_recalls' %]<a href="/cgi-bin/koha/circ/circulation.pl?borrowernumber=[% data.borrowernumber | uri %]#recalls">
>+ [%- ELSIF link_to == 'members_pay' %]<a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">
> [%- ELSE %]<a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% data.borrowernumber | uri %]">
> [%- END -%]
> [%- END -%]
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>index 300e110920..75b5cf87d0 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt
>@@ -233,7 +233,7 @@
> [% FOREACH member IN members %]
> [% SET patron = member.patron %]
> <li style="padding: 0.5em 1em;">
>- <div><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a></div>
>+ <div>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %]</div>
> [% IF member.exceeded_maxreserves %]
> <div>
> 
>@@ -329,8 +329,7 @@
> 
> [% IF ( biblioloo.alreadyres ) %]
> <li>
>- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>
>- already has a hold on this item
>+ [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] already has a hold on this item
> </li>
> [% END %]
> [% IF ( biblioloo.none_avail || biblioloo.noitems ) %]
>@@ -368,35 +367,35 @@
> <h3>Cannot place hold</h3>
> <ul>
> [% IF ( no_reserves_allowed ) %]
>- <li>No holds allowed: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> cannot place a hold on any of these items.</li>
>+ <li>No holds allowed: [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] cannot place a hold on any of these items.</li>
> [% ELSIF ( exceeded_maxreserves ) %]
>- <li>Too many holds: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% maxreserves | html %] total holds.</li>
>+ <li>Too many holds: [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] can only place a maximum of [% maxreserves | html %] total holds.</li>
> [% ELSIF ( exceeded_holds_per_record ) %]
>- <li>Too many holds for this record: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
>+ <li>Too many holds for this record: [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
> [% ELSIF ( alreadypossession ) %]
>- <li> <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> is already in possession of one item.</li>
>+ <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 hide_patron_infos_if_needed => 1 %] is already in possession of one item.</li>
> [% ELSIF ( alreadyreserved ) %]
>- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> already has a hold on this item.</li>
>+ <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] already has a hold on this item.</li>
> [% ELSIF ( ageRestricted ) %]
> <li>Age restricted</li>
> [% ELSIF ( none_available ) %]
> <li> No items are available to be placed on hold.</li>
> [% ELSIF ( maxreserves ) %]
>- <li>Too many holds: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> has too many holds.</li>
>+ <li>Too many holds: [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] has too many holds.</li>
> [% ELSIF ( recall ) %]
>- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> has already placed a recall on this item.</li>
>+ <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] has already placed a recall on this item.</li>
> [% END # /IF exceeded_maxreserves %]
> </ul>
> [% ELSE # UNLESS multi_hold %]
> <h3>Cannot place hold on some items</h3>
> [% IF (no_reserves_allowed ) %]
>- <li>No holds allowed: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> cannot place holds on some of these title's items.</li>
>+ <li>No holds allowed: [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] cannot place holds on some of these title's items.</li>
> [% ELSIF ( exceeded_maxreserves ) %]
>- <li>Too many holds: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can place [% new_reserves_allowed | html %] of the requested [% new_reserves_count | html %] holds for a maximum of [% maxreserves | html %] total holds.</li>
>+ <li>Too many holds: [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] can place [% new_reserves_allowed | html %] of the requested [% new_reserves_count | html %] holds for a maximum of [% maxreserves | html %] total holds.</li>
> [% ELSIF ( exceeded_holds_per_record ) %]
> [% FOREACH biblioloo IN biblioloop %]
> [% IF (biblioloo.tooManyHoldsForThisRecord) %]
>- <li>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]"> [% biblioloo.title | html %]</a>: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | html %]">[% patron.firstname | html %] [% patron.surname | html %] </a> can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
>+ <li>Too many holds for <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblioloo.biblionumber | uri %]"> [% biblioloo.title | html %]</a>: [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] can only place a maximum of [% max_holds_for_record | html %] hold(s) on this record.</li>
> [% END %]
> [% END %]
> [% END # /IF exceeded_maxreserves %]
>@@ -408,19 +407,19 @@
> <div class="dialog message">
> <ul>
> [% IF ( patron.is_expired ) %]
>- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: Account has expired</li>
>+ <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %]: Account has expired</li>
> [% END %]
> 
> [% IF patron.is_debarred %]
>- <li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]#reldebarments">[% patron.firstname | html %] [% patron.surname | html %]</a>: Patron has restrictions</li>
>+ <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %]: Patron has restrictions</li>
> [% END %]
> 
> [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %]
>- <li><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>: Patron has outstanding fines: [% amount_outstanding | $Price %]</li>
>+ <li>[% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 link_to => 'members_pay' %]: Patron has outstanding fines: [% amount_outstanding | $Price %]</li>
> [% END %]
> 
> [% IF ( diffbranch ) %]
>- <li> Pickup library is different. Patron: <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a> Patron's home library: ([% Branches.GetName(patron.branchcode) | html %] / [% patron.branchcode | html %] )</li>
>+ <li> Pickup library is different. Patron: [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] Patron's home library: ([% Branches.GetName(patron.branchcode) | html %] / [% patron.branchcode | html %] )</li>
> [% END %]
> </ul> 
> </div>
>@@ -463,7 +462,7 @@
> <li>
> Patron:
> [% IF ( patron.borrowernumber ) %]
>- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %] ([% patron.cardnumber | html %])</a>
>+ [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %]
> [% ELSE %]
> Not defined yet
> [% END %]
>@@ -844,10 +843,9 @@
> [% END %]
> 
> [% IF ( biblioloo.alreadyres ) %]
>- <li>
>- <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=[% patron.borrowernumber | uri %]">[% patron.firstname | html %] [% patron.surname | html %]</a>
>- already has a hold on this item
>- </li>
>+ <li>
>+ [% INCLUDE 'patron-title.inc' patron => patron no_title => 1 no_cardnumber => 1 hide_patron_infos_if_needed => 1 %] already has a hold on this item
>+ </li>
> [% END %]
> [% IF ( biblioloo.none_avail || biblioloo.noitems ) %]
> <li> No items are available to be placed on hold</li>
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 21978: 133431 | 133432 | 133433 | 133434 | 133435 | 133436 | 133437 | 133438 | 133453 | 133454 | 133455 | 133456 | 133534 | 133535 | 133536 | 133537 | 133544 | 133545 | 133546 | 133547 | 133751 | 133752 | 133753 | 133754 | 133755 | 133756 | 133757 | 134254 | 134255 | 134256 | 134257 | 134258 | 134259 | 134495 | 134497 | 134498 | 134499 | 134500 | 134501 | 134502 | 134503 | 134745 | 134746 | 134747 | 134748 | 134749 | 134750 | 134751 | 135147 | 135148 | 135149 | 135150 | 135151 | 135152 | 135153 | 135154 | 135155 | 135180 | 135181 | 135182 | 135183 | 135184 | 135185 | 135186 | 135187 | 135188 | 135189 | 136513 | 136514 | 136515 | 136516 | 136517 | 136518 | 136519 | 136520 | 136521 | 136522 | 137612