From 969af0e908ec524ed4038da81e90f6bf6901789f Mon Sep 17 00:00:00 2001 From: Emmi Takkinen Date: Thu, 12 May 2022 13:25:04 +0300 Subject: [PATCH 2/2] Bug 29768: Fix patron name displays and hyperlinks Sponsored-by: Koha-Suomi Oy --- .../prog/en/includes/background_jobs/batch_hold_cancel.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc | 4 ++-- koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt | 2 +- .../intranet-tmpl/prog/en/modules/circ/branchtransfers.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt | 2 +- .../prog/en/modules/circ/circulation_batch_checkouts.tt | 2 +- .../prog/en/modules/members/accountline-details.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/boraccount.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/holdshistory.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/housebound.tt | 6 +++--- .../intranet-tmpl/prog/en/modules/members/ill-requests.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/memberentrygen.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/merge-patrons.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/members/moremember.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt | 2 +- .../prog/en/modules/members/purchase-suggestions.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/readingrec.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/routing-lists.tt | 2 +- .../intranet-tmpl/prog/en/modules/members/statistics.tt | 2 +- .../intranet-tmpl/prog/en/modules/patron_lists/lists.tt | 2 +- .../intranet-tmpl/prog/en/modules/serials/viewalerts.tt | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt | 2 +- 26 files changed, 35 insertions(+), 35 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc index b2e45aee0a..7c6a619478 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/background_jobs/batch_hold_cancel.inc @@ -29,7 +29,7 @@ [% SWITCH m.code %] [% CASE 'hold_not_cancelled' %] [% IF m.biblio && m.patron %] - Hold on [% m.biblio.title | html %] for [% INCLUDE 'patron-title.inc' patron=m.patron %] has not been cancelled. + Hold on [% m.biblio.title | html %] for [% INCLUDE 'patron-title.inc' patron=m.patron no_html = 1 %] has not been cancelled. [% END %] An error occurred on cancelling. [% SWITCH m.error %] @@ -39,7 +39,7 @@ [% END %] [% CASE 'hold_cancelled' %] [% biblio_link = BLOCK %][% m.biblio.title | html %][% END %] - [% patron_link = BLOCK %][% INCLUDE 'patron-title.inc' patron=m.patron %][% END %] + [% patron_link = BLOCK %][% INCLUDE 'patron-title.inc' patron=m.patron no_html = 1 %][% END %] Hold on [% biblio_link | $raw | $KohaSpan %] for [% patron_link | $raw | $KohaSpan %] has successfully been cancelled. [% END %] 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 d0a3267cf5..0482fe6444 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/patron-title.inc @@ -55,7 +55,7 @@ [%- SET display_patron_name = 0 -%] [%- END -%] [%- END -%] -[%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%] +[%- IF !no_html AND ( display_patron_name OR display_cardnumber ) -%] [%- IF link_to == 'circulation_reserves' %] [%- ELSIF link_to == 'circulation_recalls' %] [%- ELSIF link_to == 'members_pay' %] @@ -79,6 +79,6 @@ A patron from library [% Branches.GetName( patron.branchcode ) | html -%] [%- END -%] -[%- IF hide_patron_infos_if_needed AND ( display_patron_name OR display_cardnumber ) -%] +[%- IF !no_html AND ( display_patron_name OR display_cardnumber ) -%] [%- END -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index d4007b3b7c..a1e9d8faaf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -44,7 +44,7 @@ [% END %]
Barcode: [% reserveloo.item.barcode | html %] - [% INCLUDE 'patron-title.inc' patron=reserveloo.borrower invert_name=1 no_title=1 %] + [% INCLUDE 'patron-title.inc' patron=reserveloo.borrower invert_name=1 no_title=1 no_html = 1 %] [% IF ( reserveloo.borrower.phone ) %]
[% reserveloo.borrower.phone | html %][% END %] [% IF ( reserveloo.borrower.first_valid_email_address ) %]
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt index 5a14e60aaa..ba148a026c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -944,15 +944,15 @@ Note that permanent location is a code, and location may be an authval. [% IF ( suggestion.isbn ) %]; ISBN:[% suggestion.isbn | html %] [% END %][% IF ( suggestion.publishercode ) %]; Published by [% suggestion.publishercode | html %] [% END %][% IF ( suggestion.publicationyear ) %] in [% suggestion.publicationyear | html %] [% END %][% IF ( suggestion.place ) %] in [% suggestion.place | html %] [% END %][% IF ( suggestion.collectiontitle ) %]; [% suggestion.collectiontitle | html %] [% END %][% IF ( suggestion.itemtype ) %]; [% AuthorisedValues.GetByCode( 'SUGGEST_FORMAT', suggestion.itemtype, 0 ) | html %] [% END %]
[% IF ( suggestion.note ) %]
[% suggestion.note | html %]
[% END %] -
[% INCLUDE 'patron-title.inc' patron => suggestion.suggester %] + [% INCLUDE 'patron-title.inc' patron => suggestion.suggester no_html = 1 %] [% IF suggestion.suggesteddate %] - [% suggestion.suggesteddate | $KohaDates %][% END %] - [% INCLUDE 'patron-title.inc' patron => suggestion.manager %] + [% INCLUDE 'patron-title.inc' patron => suggestion.manager no_html = 1 %] [% IF suggestion.manageddate %] - [% suggestion.manageddate | $KohaDates %][% END %] - [% INCLUDE 'patron-title.inc' patron => suggestion.last_modifier %] + [% INCLUDE 'patron-title.inc' patron => suggestion.last_modifier no_html = 1 %] [% IF suggestion.lastmodificationdate %] - [% suggestion.lastmodificationdate | $KohaDates %][% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt index b18cb79087..4390efd12a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt @@ -90,7 +90,7 @@ [% END %] [% IF checkout.issuer_id %] - [% INCLUDE 'patron-title.inc' patron=checkout.issuer %] + [% INCLUDE 'patron-title.inc' patron=checkout.issuer no_html = 1 %] [% END %] [% IF checkout.renewals_count %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt index ca153d719b..52af2151bf 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchtransfers.tt @@ -46,7 +46,7 @@ @@ -176,7 +176,7 @@
No valid patrons to merge were found.
[% ELSE %]

- Patron records merged into [% INCLUDE 'patron-title.inc' patron = keeper %] + Patron records merged into [% INCLUDE 'patron-title.inc' patron = keeper no_html = 1 %]

[% FOREACH pair IN results.merged.pairs %] 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 43071d2bf2..98eeb0caf2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -45,7 +45,7 @@
  • - Patron details for [% INCLUDE 'patron-title.inc' %] + Patron details for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt index d72b20bb85..02d4e9549d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -29,7 +29,7 @@
  • - Sent notices for [% INCLUDE 'patron-title.inc' %] + Sent notices for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt index 7ac37ca60a..a8c0511df1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt @@ -26,7 +26,7 @@
  • - Purchase suggestions for [% INCLUDE 'patron-title.inc' %] + Purchase suggestions for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • 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 d1df0e1e68..4d07326dfa 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -27,7 +27,7 @@
  • - Circulation history for [% INCLUDE 'patron-title.inc' %] + Circulation history for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt index 7838f9a540..008fd55d91 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/routing-lists.tt @@ -25,7 +25,7 @@
  • - Subscription routing lists for [% INCLUDE 'patron-title.inc' %] + Subscription routing lists for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt index d5385b2470..978488e210 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt @@ -38,7 +38,7 @@
  • - Statistics for [% INCLUDE 'patron-title.inc' invert_name = 1 %] + Statistics for [% INCLUDE 'patron-title.inc' invert_name = 1 no_html = 1 %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt index 229d97c8bd..32b9f3c393 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/patron_lists/lists.tt @@ -65,7 +65,7 @@ [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt index ac37c1996d..7ac5ca422f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -423,7 +423,7 @@ for Bibliographic record [% object | html %] [% END %] [% IF ( MEMBERS ) %] - for [% INCLUDE 'patron-title.inc' %] + for [% INCLUDE 'patron-title.inc' no_html = 1 %] [% END %] . -- 2.34.1
    [% IF ( reserved ) %] - Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron | html %] ([% borrowernumber | html %]). + Hold found for [% INCLUDE 'patron-title.inc' patron => hold.patron no_html = 1 | html %] ([% borrowernumber | html %]). [% END %] [% IF ( waiting ) %] Item is marked waiting at [% branchname | html %] for [% name | html %] ([% borrowernumber | html %]). 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 00cd8d5c20..0d80bb9895 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -44,7 +44,7 @@
  • - [% INCLUDE 'patron-title.inc' %] + [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index 58c88a19e3..8fce70da5a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -40,7 +40,7 @@
  • - [% INCLUDE 'patron-title.inc' %] + [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • [% ELSE %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt index 4890fd27e9..998b5114d8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -30,7 +30,7 @@ [% IF accountline %] [% IF accountline.credit_type_code %]
  • - Account for [% INCLUDE 'patron-title.inc' %] + Account for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • @@ -39,7 +39,7 @@
  • [% ELSIF accountline.debit_type_code %]
  • - Account for [% INCLUDE 'patron-title.inc' %] + Account for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • @@ -50,7 +50,7 @@ [% ELSE %]
  • - Account for [% INCLUDE 'patron-title.inc' %] + Account for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt index 4af027a880..efcc808ff9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt @@ -22,7 +22,7 @@
  • - API Keys for [% INCLUDE 'patron-title.inc' %] + API Keys for [% INCLUDE 'patron-title.inc' no_html = 1%]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index 29ac8cc576..422ece6a2a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -34,7 +34,7 @@
  • - Account for [% INCLUDE 'patron-title.inc' %] + Account for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt index e77fc365b1..5a323e17bb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -25,7 +25,7 @@
  • - Files for [% INCLUDE 'patron-title.inc' %] + Files for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt index b8f28442c3..23198af7eb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt @@ -28,7 +28,7 @@
  • - Holds history for [% INCLUDE 'patron-title.inc' %] + Holds history for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt index 116f4ce412..1734218ff6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -70,7 +70,7 @@
  • - Details for [% INCLUDE 'patron-title.inc' %] + Details for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • @@ -391,12 +391,12 @@
    [% entry.appointment_date | $KohaDates %] ([% entry.day_segment | html %]) - [% INCLUDE 'patron-title.inc' patron = entry.chooser invert_name = 0 %] + [% INCLUDE 'patron-title.inc' patron = entry.chooser invert_name = 0 no_html = 1 %] - [% INCLUDE 'patron-title.inc' patron = entry.deliverer invert_name = 0 %] + [% INCLUDE 'patron-title.inc' patron = entry.deliverer invert_name = 0 no_html = 1 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt index 87853b7bdb..e4cd81ab2b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/ill-requests.tt @@ -28,7 +28,7 @@
  • - ILL requests history for [% INCLUDE 'patron-title.inc' %] + ILL requests history for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt index 861392ce72..5a31a59aba 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -55,7 +55,7 @@ legend:hover { [% IF (borrower_data.firstname || borrower_data.surname ) %]
  • - [% INCLUDE 'patron-title.inc' %] + [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt index a735f9df0d..ac7590d482 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/merge-patrons.tt @@ -140,7 +140,7 @@
    - [% INCLUDE 'patron-title.inc' patron = p %] + [% INCLUDE 'patron-title.inc' patron = p no_html = 1 %] [% IF l.shared %] [% IF shared_by_other %] - by [% INCLUDE 'patron-title.inc' patron=l.owner %] + by [% INCLUDE 'patron-title.inc' patron=l.owner no_html = 1 %] [% ELSE %] by you [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt index ddf38a7c37..e21b810287 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt @@ -45,7 +45,7 @@ [% FOREACH subscriber IN subscribers %]
    - [% INCLUDE 'patron-title.inc' patron=subscriber %] + [% INCLUDE 'patron-title.inc' patron=subscriber not_html = 1 %]