From c7b712361230ce99197a132d6d36e7f7a110dbb3 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 30 Oct 2018 10:54:46 +0000 Subject: [PATCH] Bug 19532: (QA followup) Add missing TT filters --- .../prog/en/includes/recalls-reports.inc | 34 ++++++------ .../prog/en/includes/recalls.inc | 14 ++--- .../prog/en/modules/admin/smart-rules.tt | 4 +- .../prog/en/modules/catalogue/detail.tt | 2 +- .../prog/en/modules/circ/circulation.tt | 2 +- .../en/modules/circ/recall-pickup-slip.tt | 11 ++-- .../prog/en/modules/circ/recalls_overdue.tt | 31 ++++++----- .../prog/en/modules/circ/recalls_queue.tt | 5 +- .../prog/en/modules/circ/recalls_waiting.tt | 55 ++++++++++--------- .../prog/en/modules/circ/returns.tt | 44 +++++++-------- .../prog/en/modules/members/moremember.tt | 2 +- .../prog/en/modules/members/recallshistory.tt | 5 +- .../bootstrap/en/includes/item-status.inc | 2 +- .../bootstrap/en/modules/opac-recall.tt | 10 ++-- .../bootstrap/en/modules/opac-recalls.tt | 26 ++++----- .../bootstrap/en/modules/opac-user.tt | 34 ++++++------ 16 files changed, 143 insertions(+), 138 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc index 7ba692dd51..e939757029 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls-reports.inc @@ -26,30 +26,30 @@ [% END %] [% IF recall.is_requested || recall.is_waiting || recall.is_overdue %] - + [% ELSE %]   [% END %] - - [% recall.patron.firstname %] [% recall.patron.surname %] ([% recall.borrowernumber %]) + + [% recall.patron.firstname | html %] [% recall.patron.surname | html %] ([% recall.borrowernumber | html %]) - - [% recall.biblio.title %] + + [% recall.biblio.title | html %] [% FOREACH s IN recall.biblio.subtitles %] - [% s %] + [% s | html %] [% END %] - [% recall.item.enumchron %] + [% recall.item.enumchron | html %] - [% recall.biblio.author %] + [% recall.biblio.author | html %] - - [% recall.item.barcode %] + + [% recall.item.barcode | html %] @@ -58,25 +58,25 @@ - [% IF recall.waitingdate %][% recall.waitingdate %][% ELSE %]Not waiting[% END %] + [% IF recall.waitingdate %][% recall.waitingdate | html %][% ELSE %]Not waiting[% END %] [% IF ( recall.is_waiting ) %] [% IF ( recall.expirationdate ) %] - [% recall.expirationdate %] + [% recall.expirationdate | html %] [% ELSE %] Never expires [% END %] [% ELSIF ( recall.has_expired && recall.expirationdate ) %] - [% recall.expirationdate %] + [% recall.expirationdate | html %] [% ELSE %] - [% END %] - [% recall.library.branchname %] + [% recall.library.branchname | html %] @@ -97,9 +97,9 @@ [% IF ( recall.is_requested ) %] - Due to be returned by [% recall.checkout.date_due %] + Due to be returned by [% recall.checkout.date_due | html %] [% ELSIF ( recall.is_waiting && recall.expirationdate ) %] - Pick up by [% recall.expirationdate %] + Pick up by [% recall.expirationdate | html %] [% ELSE %] - [% END %] @@ -107,7 +107,7 @@ [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %] - Cancel + Cancel [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc index 3215544cb8..383d337fdd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc @@ -16,14 +16,14 @@ [% FOREACH recall IN recalls %] - - [% recall.biblio.title %] + + [% recall.biblio.title | html %] [% FOREACH s IN recall.biblio.subtitles %] - [% s %] + [% s | html %] [% END %] - [% recall.item.enumchron %] + [% recall.item.enumchron | html %] - [% recall.biblio.author %] + [% recall.biblio.author | html %] @@ -45,7 +45,7 @@ - [% recall.library.branchname %] + [% recall.library.branchname | html %] @@ -66,7 +66,7 @@ [% IF ( !recall.cancellationdate && ( recall.is_requested || recall.is_overdue ) ) %] - Cancel + Cancel [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index 04343dc255..1c171cd0a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -214,9 +214,9 @@ Don't allow [% END %] - [% rule.recall_due_date_interval %] + [% rule.recall_due_date_interval | html %] [% rule.recall_overdue_fine FILTER format("%.2f") %] - [% rule.recall_shelf_time %] + [% rule.recall_shelf_time | html %] [% IF rule.article_requests == 'no' %] No 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 3f97b786ff..7e634dfe5a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt @@ -489,7 +489,7 @@ [% END %] [% END %] [% IF ( item.recalled ) %] - Item recalled (placed [% item.recall.recalldate | $KohaDates %]) by [% item.recall.patron.firstname %] [% item.recall.patron.surname %] ([% item.recall.patron.cardnumber %]) + Item recalled (placed [% item.recall.recalldate | $KohaDates %]) by [% item.recall.patron.firstname | html %] [% item.recall.patron.surname | html %] ([% item.recall.patron.cardnumber | html %]) [% END %] [% UNLESS ( item.itemnotforloan || item.notforloan_per_itemtype || item.onloan || item.itemlost || item.withdrawn || item.damaged || item.transfertwhen || item.reservedate || item.recalled ) %] Available 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 96af5172e5..350d3d56a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -828,7 +828,7 @@ No patron matched [% message | html %] [% IF Koha.Preference('UseRecalls') && recalls.count %] -
  • [% recalls.count %] Recall(s)
  • +
  • [% recalls.count | html %] Recall(s)
  • [% END %] [% IF Koha.Preference('ArticleRequests') %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recall-pickup-slip.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recall-pickup-slip.tt index a2ba1e7e53..ced3d5e639 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recall-pickup-slip.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recall-pickup-slip.tt @@ -1,13 +1,14 @@ +[% USE raw %] [% USE Asset %] [% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] Koha › Circulation › Recall print receipt [% INCLUDE 'doc-head-close.inc' %] - -[% Asset.css("css/print.css") %] + +[% Asset.css("css/print.css") | $raw %] [% IF ( Koha.Preference('SlipCSS') ) %] - + [% END %] [% INCLUDE 'slip-print.inc' #printThenClose %] @@ -17,10 +18,10 @@ [% IF plain %]
    -[% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %]
    +[% IF ( slip ) %][% slip | html %][% ELSE %]No slip template found[% END %]
     
    [% ELSE %] -[% IF ( slip ) %][% slip %][% ELSE %]No slip template found[% END %] +[% IF ( slip ) %][% slip | html %][% ELSE %]No slip template found[% END %] [% END %] [% INCLUDE 'intranet-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt index 787018a07c..36e2e64db6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_overdue.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE Asset %] [% USE Koha %] [% USE KohaDates %] @@ -5,8 +6,8 @@ Koha › Circulation › Overdue recalls [% INCLUDE 'doc-head-close.inc' %] - -[% Asset.js("js/recalls.js") %] + +[% Asset.js("js/recalls.js") | $raw %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] @@ -55,39 +56,39 @@ [% FOREACH recall IN recalls %] - + - - [% recall.patron.firstname %] [% recall.patron.surname %] ([% recall.borrowernumber %]) + + [% recall.patron.firstname | html %] [% recall.patron.surname | html %] ([% recall.borrowernumber | html %]) - - [% recall.biblio.title %] + + [% recall.biblio.title | html %] [% FOREACH s IN recall.biblio.subtitles %] - [% s %] + [% s | html %] [% END %] - [% recall.item.enumchron %] + [% recall.item.enumchron | html %] - [% recall.biblio.author %] + [% recall.biblio.author | html %] [% recall.recalldate | $KohaDates %] - [% recall.checkout.date_due %] + [% recall.checkout.date_due | html %] - - [% recall.checkout.patron.firstname %] [% recall.checkout.patron.surname %] ([% recall.checkout.borrowernumber %]) + + [% recall.checkout.patron.firstname | html %] [% recall.checkout.patron.surname | html %] ([% recall.checkout.borrowernumber | html %]) - [% recall.library.branchname %] + [% recall.library.branchname | html %] - Cancel + Cancel [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt index 3efe280aa2..030017ffa2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/recalls_queue.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE Asset %] [% USE Koha %] [% USE KohaDates %] @@ -6,7 +7,7 @@ Koha › Circulation › Recalls queue [% INCLUDE 'doc-head-close.inc' %] - + [% INCLUDE 'header.inc' %] @@ -59,7 +60,7 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'datatables.inc' %] [% INCLUDE 'columns_settings.inc' %] - [% Asset.js("js/recalls.js") %] + [% Asset.js("js/recalls.js") | $raw %]