From ccb8f8773e07f66c47281d52105caf4a261f21a0 Mon Sep 17 00:00:00 2001 From: Katrin Fischer <katrin.fischer.83@web.de> Date: Sat, 11 Apr 2020 20:52:28 +0000 Subject: [PATCH] Bug 17656: (follow-up) Add missing filters Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net> --- .../en/includes/serials/subscription_daily_choice.inc | 8 ++++---- .../en/includes/serials/subscription_monthly_choice.inc | 8 ++++---- .../en/includes/serials/subscription_weekly_choice.inc | 6 +++--- .../prog/en/modules/serials/subscription-renew.tt | 7 ++++--- 4 files changed, 15 insertions(+), 14 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 6a7fc42da0..9970100150 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,14 +19,14 @@ [% FOREACH day IN daily_choice %] [% IF permanent_irreg.grep( day.value ).0 == day.value %] <input type="checkbox" name="permanent_irregularity" - id="[% day.name %]" data-dow="[% day.value %]" - value="[% day.value %]" class="skip" + id="[% day.name | html %]" data-dow="[% day.value | html %]" + value="[% day.value | html %]" class="skip" checked="checked" /> [% ELSE %] <input type="checkbox" name="permanent_irregularity" - id="[% day.name %]" data-dow="[% day.value %]" - value="[% day.value %]" class="skip" + id="[% day.name | html %]" data-dow="[% day.value | html %]" + value="[% day.value | html %]" class="skip" /> [% END %] <label for="[% day.name | html %]" class="inline">[% PROCESS days d=day.name %]</label> 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 6ba98e33a3..488ee98cf8 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,14 +24,14 @@ [% FOREACH month IN monthly_choice %] [% IF permanent_irreg.grep( month.value ).0 == month.value %] <input type="checkbox" name="permanent_irregularity" - id="[% month.name %]" data-dow="[% month.value %]" - value="[% month.value %]" class="skip" + id="[% month.name | html %]" data-dow="[% month.value | html %]" + value="[% month.value | html %]" class="skip" checked="checked" /> [% ELSE %] <input type="checkbox" name="permanent_irregularity" - id="[% month.name %]" data-dow="[% month.value %]" - value="[% month.value %]" class="skip" + id="[% month.name | html %]" data-dow="[% month.value | html %]" + value="[% month.value | html %]" class="skip" /> [% END %] <label for="[% month.name | html %]" class="inline">[% PROCESS months m=month.name %]</label> 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 594243e336..43cb536302 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 @@ <li> <a href="#" class="small"> [% IF permanent_irreg.grep( p.dow ).0 == p.dow %] - <input type="checkbox" name="permanent_irregularity" value="[% p.dow %]" data-dow="[% p.dow %]" class="skip" checked="checked"/> + <input type="checkbox" name="permanent_irregularity" value="[% p.dow | html %]" data-dow="[% p.dow | html %]" class="skip" checked="checked"/> [% ELSE %] - <input type="checkbox" name="permanent_irregularity" value="[% p.dow %]" data-dow="[% p.dow %]" class="skip"/> + <input type="checkbox" name="permanent_irregularity" value="[% p.dow | html %]" data-dow="[% p.dow | html %]" class="skip"/> [% END %] - Week <b>#[% p.dow %]</b> ([% p.publicationdate | $KohaDates %]) + Week <b>#[% p.dow | html %]</b> ([% p.publicationdate | $KohaDates %]) </a> </li> [% 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 dec0835152..0cd000e711 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,5 +1,6 @@ [% USE Koha %] [% USE Branches %] +[% USE raw %] [% USE Asset %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] @@ -120,9 +121,9 @@ [% MACRO jsinclude BLOCK %] [% INCLUDE 'calendar.inc' %] <script> - var subscriptionid = "[% subscription.subscriptionid %]"; - var irregularity = "[% subscription.irregularity %]"; - var more_than_one_serial = "[% more_than_one_serial %]"; + var subscriptionid = "[% subscription.subscriptionid | html %]"; + var irregularity = "[% subscription.irregularity | html %]"; + var more_than_one_serial = "[% more_than_one_serial | html %]"; $(document).ready(function(){ if (subscriptionid) { testPredictionPattern(); -- 2.30.2