From 8d6ab379d49634e18088df19b2f533cbf76840c8 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 +- 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 +- 25 files changed, 34 insertions(+), 34 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..4fcc428571 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 hide_patron_infos_if_needed 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 hide_patron_infos_if_needed 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 0fbbb9442b..fe5a7bdf7d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -935,15 +935,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 7bfb40dd1c..f591350b35 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tt @@ -87,7 +87,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/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index 49b9a302c1..ff59acc4ae 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -42,7 +42,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 ef837f5b2f..5ac09e5dcf 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 @@ -38,7 +38,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 1a328dac49..da7083aef5 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 @@ -28,7 +28,7 @@ [% IF accountline %] [% IF accountline.credit_type_code %]
  • - Account for [% INCLUDE 'patron-title.inc' %] + Account for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • @@ -37,7 +37,7 @@
  • [% ELSIF accountline.debit_type_code %]
  • - Account for [% INCLUDE 'patron-title.inc' %] + Account for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • @@ -48,7 +48,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 71fcf5b6d6..8b2ae32eab 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/apikeys.tt @@ -20,7 +20,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 5223997277..9ca590cccc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -32,7 +32,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 541128e4ee..1a576698d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/files.tt @@ -23,7 +23,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 cb53a59913..6ef9e2b55f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/holdshistory.tt @@ -26,7 +26,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 20879d16ae..8e3e0bd80d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/housebound.tt @@ -68,7 +68,7 @@
  • - Details for [% INCLUDE 'patron-title.inc' %] + Details for [% INCLUDE 'patron-title.inc' no_html = 1 %]
  • @@ -388,12 +388,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 fa95e58d57..7b15938a49 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 @@ -26,7 +26,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 445e11e553..80b22fbf0e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentrygen.tt @@ -52,7 +52,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 0461c5a862..f2bc2387a8 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 @@ -137,7 +137,7 @@ - [% INCLUDE 'patron-title.inc' patron = p %] + [% INCLUDE 'patron-title.inc' patron = p no_html = 1 %] @@ -173,7 +173,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 1f81893700..dfb3bcb04d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -43,7 +43,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 8922a7557c..647dd46e55 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/notices.tt @@ -27,7 +27,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 24da899b90..89b2a9c3c5 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 @@ -24,7 +24,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 f3121647bd..a26eb502b1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tt @@ -25,7 +25,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 ce35ab360a..a6f76cba99 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 @@ -23,7 +23,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 14298e6f44..5e9d39918d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/statistics.tt @@ -36,7 +36,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 7dfa414206..d3d3714937 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 @@ -61,7 +61,7 @@ [% 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 0bcfe25354..222402c7b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/viewalerts.tt @@ -41,7 +41,7 @@ [% FOREACH subscriber IN subscribers %] - [% INCLUDE 'patron-title.inc' patron=subscriber %] + [% INCLUDE 'patron-title.inc' patron=subscriber not_html = 1 %] [% 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 24fc22f669..d1f8c2576a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/viewlog.tt @@ -413,7 +413,7 @@ for Bibliographic record [% object | html %] [% END %] [% IF ( MEMBERS ) %] - for [% INCLUDE 'patron-title.inc' %] + for [% INCLUDE 'patron-title.inc' no_html = 1 %] [% END %] . -- 2.25.1