Attachment 103630 Details for Bug 17656 – Bug 17656: (follow-up) Add missing filters

[patch] Bug 17656: (follow-up) Add missing filters

Bug-17656-follow-up-Add-missing-filters.patch (text/plain), 6.32 KB, created by Alex Arnaud on 2020-04-24 08:17:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Arnaud

Created: 2020-04-24 08:17:09 UTC

Size: 6.32 KB

patch

obsolete

>From d08130f4101e3dac8e4185ed3b04fbcb7e1a7066 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
>
>---
> .../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 %]
>         <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 %]">[% PROCESS days d=day.name %]</label>
>+    <label for="[% day.name | html %]">[% PROCESS days d=day.name %]</label>
> [% 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 %]
>         <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 %]">[% PROCESS months m=month.name %]</label>
>+    <label for="[% month.name | html %]">[% PROCESS months m=month.name %]</label>
> [% 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 @@
>                     <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 %]
>-                            &nbsp;Week <b>#[% p.dow %]</b> ([% p.publicationdate | $KohaDates %])
>+                            &nbsp;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 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' %]
>     <script type="text/javascript">
>-        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();
>@@ -127,9 +128,9 @@
>             });
>         });
>     </script>
>-    [% 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

Actions: View | Diff | Splinter Review

Attachments on bug 17656: 68259 | 68261 | 68607 | 68608 | 68665 | 69124 | 69207 | 69279 | 69553 | 69814 | 69820 | 69915 | 70335 | 70336 | 70430 | 70619 | 75403 | 75404 | 75405 | 75406 | 75407 | 75408 | 75721 | 75722 | 75723 | 75724 | 75725 | 75726 | 75953 | 102724 | 102725 | 102726 | 102727 | 102728 | 102729 | 102730 | 102860 | 102861 | 102862 | 102863 | 102864 | 102865 | 102866 | 102867 | 102960 | 102961 | 102962 | 102963 | 102964 | 102965 | 102966 | 102967 | 102968 | 103623 | 103624 | 103625 | 103626 | 103627 | 103628 | 103629 | 103630 | 103631 | 103657 | 103658 | 103659 | 103660 | 103661 | 103662 | 103663 | 103664 | 103665 | 103667 | 117789 | 117790 | 117791 | 117792 | 117846 | 117851 | 117852 | 118856 | 119106 | 120863 | 121082 | 121083 | 121084 | 121085 | 121086 | 121087 | 121088 | 121192 | 121193 | 121194 | 121195 | 121196 | 121197 | 121198 | 121296 | 121297 | 121298 | 121299 | 121300 | 121301 | 121302 | 128489 | 128491 | 128492 | 128493 | 128494 | 128495 | 128496 | 128498 | 128499 | 128500 | 128501 | 128502 | 128503 | 128504 | 132412 | 132413 | 132415 | 132416 | 132417 | 132418 | 132447 | 132448 | 132692 | 132779