Bugzilla – Attachment 94199 Details for
Bug 18936
Move issuingrules into circulation_rules
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 18936: Add missing filters
Bug-18936-Add-missing-filters.patch (text/plain), 8.98 KB, created by
Jonathan Druart
on 2019-10-15 12:34:23 UTC
(
hide
)
Description:
Bug 18936: Add missing filters
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2019-10-15 12:34:23 UTC
Size:
8.98 KB
patch
obsolete
>From 7c1c6b0e3e419958c690d554a28a3e0a9ecfebf0 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Sun, 4 Aug 2019 14:31:04 -0500 >Subject: [PATCH] Bug 18936: Add missing filters > >--- > .../prog/en/modules/admin/smart-rules.tt | 44 +++++++++++----------- > 1 file changed, 22 insertions(+), 22 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >index b98579ea4b..b812800acb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt >@@ -157,24 +157,24 @@ > [% SET show_rule = maxissueqty || maxonsiteissueqty || issuelength || lengthunit || hardduedate || hardduedatebefore || hardduedateexact || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || renewalsallowed || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || article_requests %] > [% IF show_rule %] > [% SET row_count = row_count + 1 %] >- <tr row_countd="row_[% row_count %]"> >+ <tr row_countd="row_[% row_count | html %]"> > <td> > [% IF c == undef %] > <em>All</em> > [% ELSE %] >- [% Categories.GetName(c) %] >+ [% Categories.GetName(c) | html %] > [% END %] > </td> > <td> > [% IF i == undef %] > <em>All</em> > [% ELSE %] >- [% ItemTypes.GetDescription(i) %] >+ [% ItemTypes.GetDescription(i) | html %] > [% END %] > </td> > <td class="actions"> > <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype || '*' %]&categorycode=[% rule.categorycode || '*' %]&branch=[% current_branch %]"><i class="fa fa-trash"></i> Delete</a> >+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype || '*' | html %]&categorycode=[% rule.categorycode || '*' | html %]&branch=[% current_branch | html %]"><i class="fa fa-trash"></i> Delete</a> > </td> > <td> > [% IF note.defined %] >@@ -183,19 +183,19 @@ > </td> > <td> > [% IF maxissueqty.defined && maxissueqty != '' %] >- [% maxissueqty %] >+ [% maxissueqty | html %] > [% ELSE %] > <span>Unlimited</span> > [% END %] > </td> > <td> > [% IF maxonsiteissueqty.defined && maxonsiteissueqty != '' %] >- [% maxonsiteissueqty %] >+ [% maxonsiteissueqty | html %] > [% ELSE %] > <span>Unlimited</span> > [% END %] > </td> >- <td>[% issuelength %]</td> >+ <td>[% issuelength | html %]</td> > <td> > [% IF ( lengthunit == 'days' ) %] > Days >@@ -221,10 +221,10 @@ > <span>None defined</span> > [% END %] > </td> >- <td>[% fine %]</td> >- <td>[% chargeperiod %]</td> >+ <td>[% fine | html %]</td> >+ <td>[% chargeperiod | html %]</td> > <td>[% IF chargeperiod_charge_at %]Start of interval[% ELSE %]End of interval[% END %]</td> >- <td>[% firstremind %]</td> >+ <td>[% firstremind | html %]</td> > <td>[% overduefinescap FILTER format("%.2f") %]</td> > <td> > [% IF cap_fine_to_replacement_price %] >@@ -233,12 +233,12 @@ > <input type="checkbox" disabled="disabled" /> > [% END %] > </td> >- <td>[% finedays %]</td> >- <td>[% maxsuspensiondays %]</td> >- <td>[% suspension_chargeperiod %]</td> >- <td>[% renewalsallowed %]</td> >- <td>[% renewalperiod %]</td> >- <td>[% norenewalbefore %]</td> >+ <td>[% finedays | html %]</td> >+ <td>[% maxsuspensiondays | html %]</td> >+ <td>[% suspension_chargeperiod | html %]</td> >+ <td>[% renewalsallowed | html %]</td> >+ <td>[% renewalperiod | html %]</td> >+ <td>[% norenewalbefore | html %]</td> > <td> > [% IF auto_renew %] > <span>Yes</span> >@@ -246,17 +246,17 @@ > <span>No</span> > [% END %] > </td> >- <td>[% no_auto_renewal_after %]</td> >- <td>[% no_auto_renewal_after_hard_limit %]</td> >- <td>[% reservesallowed %]</td> >+ <td>[% no_auto_renewal_after | html %]</td> >+ <td>[% no_auto_renewal_after_hard_limit | html %]</td> >+ <td>[% reservesallowed | html %]</td> > <td> > [% IF holds_per_day.defined && holds != '' %] >- [% holds_per_day %] >+ [% holds_per_day | html %] > [% ELSE %] > <span>Unlimited</span> > [% END %] > </td> >- <td>[% holds_per_record %]</td> >+ <td>[% holds_per_record | html %]</td> > <td> > [% IF onshelfholds == 1 %] > <span>Yes</span> >@@ -286,7 +286,7 @@ > <span>Item only</span> > [% END %] > </td> >- <td>[% rentaldiscount %]</td> >+ <td>[% rentaldiscount | html %]</td> > <td class="actions"> > <a href="#" class="editrule btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> > <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&itemtype=[% rule.itemtype || '*' | uri %]&categorycode=[% rule.categorycode || '*' | uri %]&branch=[% rule.current_branch | uri %]"><i class="fa fa-trash"></i> Delete</a> >-- >2.11.0
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 18936
:
65247
|
65248
|
65249
|
67629
|
67758
|
68236
|
71034
|
71035
|
71036
|
71037
|
71038
|
71039
|
71040
|
71041
|
72230
|
72231
|
72232
|
72233
|
72234
|
72235
|
72236
|
72237
|
72238
|
91953
|
91954
|
91955
|
91956
|
91957
|
91958
|
91959
|
91960
|
91961
|
91962
|
91963
|
91964
|
91965
|
91966
|
91967
|
91968
|
91969
|
91970
|
91971
|
91972
|
91973
|
91974
|
91975
|
94179
|
94180
|
94181
|
94182
|
94183
|
94184
|
94185
|
94186
|
94187
|
94188
|
94189
|
94190
|
94191
|
94192
|
94193
|
94194
|
94195
|
94196
|
94197
|
94198
|
94199
|
94200
|
98299
|
98300
|
98301
|
98302
|
98303
|
98304
|
98305
|
98306
|
98307
|
98308
|
98309
|
98310
|
98311
|
98312
|
98313
|
98314
|
98315
|
98316
|
98317
|
98318
|
98319
|
98320
|
98321
|
98322
|
98323
|
98324
|
98325
|
98326
|
98327
|
98328
|
98329
|
98330
|
98331
|
98332
|
98333
|
98334
|
98335
|
98336
|
98337
|
98338
|
98339
|
98340
|
98341
|
98342
|
98343
|
98344
|
98345
|
98346
|
98347
|
98407
|
98408