Bugzilla – Attachment 177832 Details for
Bug 17656
Irregularities in serial prediction pattern are planned only for current subscription
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17656: (follow-up) Add missing filters
Bug-17656-follow-up-Add-missing-filters.patch (text/plain), 6.00 KB, created by
Jonathan Druart
on 2025-02-12 10:42:02 UTC
(
hide
)
Description:
Bug 17656: (follow-up) Add missing filters
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2025-02-12 10:42:02 UTC
Size:
6.00 KB
patch
obsolete
>From 16001357a40572ea46e1d989731a3db60309f421 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> >Signed-off-by: David Nind <david@davidnind.com> >--- > .../prog/en/includes/serials/subscription_daily_choice.inc | 4 ++-- > .../en/includes/serials/subscription_monthly_choice.inc | 4 ++-- > .../en/includes/serials/subscription_weekly_choice.inc | 6 +++--- > .../prog/en/modules/serials/subscription-renew.tt | 7 ++++--- > 4 files changed, 11 insertions(+), 10 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 6525718988d..321226cce0f 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 >@@ -22,9 +22,9 @@ > > [% 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" checked="checked" /> >+ <input type="checkbox" name="permanent_irregularity" 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" /> >+ <input type="checkbox" name="permanent_irregularity" 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> > [% 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 bb4eb58d759..0ffa416e9e6 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 >@@ -32,9 +32,9 @@ > > [% 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" checked="checked" /> >+ <input type="checkbox" name="permanent_irregularity" 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" /> >+ <input type="checkbox" name="permanent_irregularity" 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> > [% 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 1817d66371c..e97719e8eb3 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 8d5a03e6568..c05fb8c371d 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 >@@ -2,6 +2,7 @@ > [% USE Koha %] > [% USE Branches %] > [% PROCESS 'i18n.inc' %] >+[% USE raw %] > [% USE Asset %] > [% SET footerjs = 1 %] > [% INCLUDE 'doc-head-open.inc' %] >@@ -158,9 +159,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.34.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
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
|
177497
|
177498
|
177499
|
177500
|
177501
|
177502
|
177503
|
177504
|
177505
|
177663
|
177664
|
177665
|
177666
|
177667
|
177668
|
177669
|
177670
|
177671
|
177831
| 177832 |
177833
|
177834
|
177835
|
177836
|
177837
|
177838
|
177839
|
178142