From 65e95e2589c0971b230de9cc349e696b67c4e18c Mon Sep 17 00:00:00 2001 From: Alex Arnaud Date: Mon, 5 Nov 2018 15:55:05 +0100 Subject: [PATCH] Bug 17047: [QA tool] add template filters Signed-off-by: Kyle M Hall --- .../mana/mana-report-search-result.inc | 28 +++++----- .../mana/mana-subscription-search-result.inc | 32 ++++++------ .../prog/en/includes/reports-toolbar.inc | 6 +-- .../prog/en/includes/serials-toolbar.inc | 52 +++++++++---------- .../modules/reports/guided_reports_start.tt | 42 +++++++-------- .../prog/en/modules/serials/serials-search.tt | 2 +- .../en/modules/serials/subscription-add.tt | 2 +- .../en/modules/serials/subscription-detail.tt | 2 +- 8 files changed, 83 insertions(+), 83 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc index b95600cb7b..5ec88b8025 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-report-search-result.inc @@ -45,30 +45,30 @@ $(document).ready(function() { [% FOREACH report IN reports %] [% UNLESS report.cannotdisplay %] [% IF report.nbofcomment > highWarned %] - + [% ELSIF report.nbofcomment > warned %] - + [% ELSIF report.nbofcomment > lowWarned %] - + [% END %] - - [% IF ( report.report_name ) %][% report.report_name %][% END %] -
+ + [% IF ( report.report_name ) %][% report.report_name | html %][% END %] +
[% IF report.notes.length > 200 %] - [% report.notes.substr(0,200) %]Show More
[% END %] - [% report.type %] - [% IF ( report.nbofusers ) %][% report.nbofusers %][% END %] - [% report.lastimport | $KohaDates %] - [% FOREACH comment IN report.comments %][% comment.message %] ([% comment.nb %])
[% END %] + [% report.type | html %] + [% IF ( report.nbofusers ) %][% report.nbofusers | $raw %][% END %] + [% report.lastimport | $KohaDates %] + [% FOREACH comment IN report.comments %][% comment.message | html %] ([% comment.nb | $raw %])
[% END %] [% UNLESS search_only %] - + [% END %] @@ -77,5 +77,5 @@ $(document).ready(function() { [% ELSE %] -

[% msg %] statuscode: [% statuscode %]

+

[% msg | html %] statuscode: [% statuscode | $raw %]

[% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc index 34c3f4213a..891ce4cbc6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/mana/mana-subscription-search-result.inc @@ -35,29 +35,29 @@ $(document).ready(function() { [% FOREACH subscription IN subscriptions %] [% UNLESS subscription.cannotdisplay %] [% IF subscription.nbofcomment > highWarned %] - + [% ELSIF subscription.nbofcomment > warned %] - + [% ELSIF subscription.nbofcomment > lowWarned %] - + [% END %] - - [% IF ( subscription.issn ) %][% subscription.issn %][% END %] - [% subscription.title %] - [% IF ( subscription.publishercode ) %][% subscription.publishercode %][% END %] - [% IF ( subscription.sfdescription ) %][% subscription.sfdescription %][% END %] - [% IF ( subscription.numberingmethod ) %][% subscription.numberingmethod %][% END %] - [% IF ( subscription.nbofusers ) %][% subscription.nbofusers %][% END %] - [% subscription.lastimport | $KohaDates %] - [% FOREACH comment IN subscription.comments %][% comment.message %] ([% comment.nb %])
[% END %] + + [% IF ( subscription.issn ) %][% subscription.issn | html %][% END %] + [% subscription.title | html %] + [% IF ( subscription.publishercode ) %][% subscription.publishercode | html %][% END %] + [% IF ( subscription.sfdescription ) %][% subscription.sfdescription | html %][% END %] + [% IF ( subscription.numberingmethod ) %][% subscription.numberingmethod | html %][% END %] + [% IF ( subscription.nbofusers ) %][% subscription.nbofusers | $raw %][% END %] + [% subscription.lastimport | $KohaDates %] + [% FOREACH comment IN subscription.comments %][% comment.message | html %] ([% comment.nb | $raw %])
[% END %] [% UNLESS search_only %] - - [% FOREACH comment IN subscription.comments %] - + [% END %] @@ -70,7 +70,7 @@ $(document).ready(function() { [% ELSE %] -

Mana search fails with the code: [% statuscode %]

+

Mana search fails with the code: [% statuscode | html %]

[% END %]
- +
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc index 4bba3299b8..281af8e145 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials-toolbar.inc @@ -66,8 +66,8 @@
- +
@@ -109,12 +109,12 @@
-

Share [% bibliotitle %] to Mana

+

Share [% bibliotitle | html %] to Mana

[% IF (mana_id) %]
-

[% (mana_id) %]

+

[% mana_id | $raw %]

Your subscription is already linked with a Mana subscription model. Share it if you have made modifications, otherwise it will do nothing.

[% END %] @@ -122,10 +122,10 @@ [% UNLESS ( one_language_enabled ) %]
  • Frequency: - [% frequency.description %] + [% frequency.description | html %]
  • Number pattern: - [% numberpattern.label %] + [% numberpattern.label | html %]
    • @@ -140,20 +140,20 @@ [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %] [% IF ( sublanguages_loo.enabled ) %] [% IF ( sublanguages_loo.sublanguage_current ) %] - [% ELSE %] - [% END %] [% END %] @@ -161,19 +161,19 @@ [% ELSE %] [% IF ( languages_loo.group_enabled ) %] [% IF ( languages_loo.current ) %] - [% ELSE %] - [% END %] @@ -183,7 +183,7 @@ [% END %] - +
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt index d1782540b3..50df03bba9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/guided_reports_start.tt @@ -137,7 +137,7 @@ canned reports and writing custom SQL reports.

    [% IF report_converted %]
    - The report "[% report_converted %]" has been converted. + The report "[% report_converted | html %]" has been converted.
    [% END %] @@ -179,7 +179,7 @@ canned reports and writing custom SQL reports.

    [% IF manamsg %] [% END %] @@ -377,21 +377,21 @@ canned reports and writing custom SQL reports.

    [% FOREACH sublanguages_loo IN languages_loo.sublanguages_loop %] [% IF ( sublanguages_loo.enabled ) %] [% IF ( sublanguages_loo.sublanguage_current ) %] - [% ELSE %] - [% END %] [% END %] @@ -399,19 +399,19 @@ canned reports and writing custom SQL reports.

    [% ELSE %] [% IF ( languages_loo.group_enabled ) %] [% IF ( languages_loo.current ) %] - [% ELSE %] - [% END %] @@ -422,7 +422,7 @@ canned reports and writing custom SQL reports.

    [% ELSE %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index adc7428749..bbca46c981 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -516,7 +516,7 @@ $(".ui-datepicker-trigger").hide(); $("label[for=location], select#location_filter").hide(); [% FOR field IN additional_fields_for_subscription %] - $("label[for=additional_field_[% field.id %]], input#additional_field_[% field.id %]").hide(); + $("label[for=additional_field_[% field.id | $raw %]], input#additional_field_[% field.id | $raw %]").hide(); [% END %] [% END %] }); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt index a7bb4710ec..77db9bdca9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tt @@ -529,7 +529,7 @@ width: 300px; /* not enough for IE7 apparently */ [% FOREACH field IN dont_export_field_loop %] tags.push("[% field.fieldid | html %]"); [% END %] - var mana_enabled = [% Koha.Preference('Mana') %] + var mana_enabled = [% Koha.Preference('Mana') | html %] var MSG_LINK_TO_VENDOR = _("If you wish to claim late or missing issues you must link this subscription to a vendor. Click OK to ignore or Cancel to return and enter a vendor"); var MSG_LINK_BIBLIO = _("You must choose or create a bibliographic record"); var MSG_REQUIRED_SUB_LENGTH = _("You must choose a subscription length or an end date."); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt index 141b63ab74..193b70758a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt @@ -62,7 +62,7 @@ [% IF mana_code.defined %]

    - [% mana_code %] + [% mana_code | html %]

    [% END %] -- 2.17.2 (Apple Git-113)