From d08130f4101e3dac8e4185ed3b04fbcb7e1a7066 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Sat, 11 Apr 2020 20:52:28 +0000 Subject: [PATCH] Bug 17656: (follow-up) Add missing filters --- .../prog/en/includes/serials/subscription_daily_choice.inc | 10 +++++----- .../en/includes/serials/subscription_monthly_choice.inc | 10 +++++----- .../prog/en/includes/serials/subscription_weekly_choice.inc | 6 +++--- .../prog/en/modules/serials/subscription-renew.tt | 13 +++++++------ 4 files changed, 20 insertions(+), 19 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_daily_choice.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_daily_choice.inc index 85e579e..3c990c6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_daily_choice.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_daily_choice.inc @@ -19,15 +19,15 @@ [% FOREACH day IN daily_choice %] [% IF permanent_irreg.grep( day.value ).0 == day.value %] [% ELSE %] [% END %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_monthly_choice.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_monthly_choice.inc index 1965791..671bc5a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_monthly_choice.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_monthly_choice.inc @@ -24,15 +24,15 @@ [% FOREACH month IN monthly_choice %] [% IF permanent_irreg.grep( month.value ).0 == month.value %] [% ELSE %] [% END %] - + [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_weekly_choice.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_weekly_choice.inc index 594243e..43cb536 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_weekly_choice.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/serials/subscription_weekly_choice.inc @@ -10,11 +10,11 @@
  • [% IF permanent_irreg.grep( p.dow ).0 == p.dow %] - + [% ELSE %] - + [% END %] -  Week #[% p.dow %] ([% p.publicationdate | $KohaDates %]) +  Week #[% p.dow | html %] ([% p.publicationdate | $KohaDates %])
  • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt index d7a074e..8dde4b4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-renew.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% USE Asset %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -113,9 +114,9 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] - [% Asset.js("js/subscription-add.js") %] - [% Asset.js("js/subscription.js") %] - [% Asset.js("js/showpredictionpattern.js") %] + [% Asset.js("js/subscription-add.js") | $raw %] + [% Asset.js("js/subscription.js") | $raw %] + [% Asset.js("js/showpredictionpattern.js") | $raw %] [% END %] [% INCLUDE 'intranet-bottom.inc' popup_window=1 %] -- 2.7.4