Attachment 107533 Details for Bug 25089 – Bug 25089: (OLD GUI) Indent and add checkout type to all_rules hash

[patch] Bug 25089: (OLD GUI) Indent and add checkout type to all_rules hash

Bug-25089-OLD-GUI-Indent-and-add-checkout-type-to-.patch (text/plain), 30.29 KB, created by Lari Taskula on 2020-07-29 19:55:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Lari Taskula

Created: 2020-07-29 19:55:22 UTC

Size: 30.29 KB

patch

obsolete

>From 33e6a73621b09c2a81293928856d9913d1d867a7 Mon Sep 17 00:00:00 2001
>From: Lari Taskula <lari.taskula@hypernova.fi>
>Date: Wed, 29 Jul 2020 19:49:51 +0000
>Subject: [PATCH] Bug 25089: (OLD GUI) Indent and add checkout type to
> all_rules hash
>
>No other changes in this patch.
>
>To test:
>1. git diff --word-diff=color --ignore-all-space HEAD~1 -- koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
>2. Observe only $ct has been added
>
>Sponsored-by: The National Library of Finland
>---
> .../prog/en/modules/admin/smart-rules.tt | 388 +++++++++---------
> 1 file changed, 194 insertions(+), 194 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 88919074c7..ed29b113f1 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
>@@ -134,202 +134,202 @@
> [% FOREACH c IN categorycodes %]
> [% SET c = '' UNLESS c.defined %]
> [% FOREACH i IN itemtypes %]
>- [% SET i = '' UNLESS i.defined %]
>- [% SET ct = '' UNLESS ct.defined %]
>- [% SET note = all_rules.$c.$i.note %]
>- [% SET maxissueqty = all_rules.$c.$i.maxissueqty %]
>- [% SET issuelength = all_rules.$c.$i.issuelength %]
>- [% SET daysmode = all_rules.$c.$i.daysmode %]
>- [% SET lengthunit = all_rules.$c.$i.lengthunit %]
>- [% SET hardduedate = all_rules.$c.$i.hardduedate %]
>- [% SET hardduedatecompare = all_rules.$c.$i.hardduedatecompare %]
>- [% SET fine = all_rules.$c.$i.fine %]
>- [% SET chargeperiod = all_rules.$c.$i.chargeperiod %]
>- [% SET chargeperiod_charge_at = all_rules.$c.$i.chargeperiod_charge_at %]
>- [% SET firstremind = all_rules.$c.$i.firstremind %]
>- [% SET overduefinescap = all_rules.$c.$i.overduefinescap %]
>- [% SET cap_fine_to_replacement_price = all_rules.$c.$i.cap_fine_to_replacement_price %]
>- [% SET finedays = all_rules.$c.$i.finedays %]
>- [% SET maxsuspensiondays = all_rules.$c.$i.maxsuspensiondays %]
>- [% SET suspension_chargeperiod = all_rules.$c.$i.suspension_chargeperiod %]
>- [% SET renewalsallowed = all_rules.$c.$i.renewalsallowed %]
>- [% SET renewalperiod = all_rules.$c.$i.renewalperiod %]
>- [% SET norenewalbefore = all_rules.$c.$i.norenewalbefore %]
>- [% SET auto_renew = all_rules.$c.$i.auto_renew %]
>- [% SET no_auto_renewal_after = all_rules.$c.$i.no_auto_renewal_after %]
>- [% SET no_auto_renewal_after_hard_limit = all_rules.$c.$i.no_auto_renewal_after_hard_limit %]
>- [% SET reservesallowed = all_rules.$c.$i.reservesallowed %]
>- [% SET holds_per_day = all_rules.$c.$i.holds_per_day %]
>- [% SET holds_per_record = all_rules.$c.$i.holds_per_record %]
>- [% SET onshelfholds = all_rules.$c.$i.onshelfholds %]
>- [% SET opacitemholds = all_rules.$c.$i.opacitemholds %]
>- [% SET article_requests = all_rules.$c.$i.article_requests %]
>- [% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]
>+ [% SET i = '' UNLESS i.defined %]
>+ [% SET ct = '' UNLESS ct.defined %]
>+ [% SET note = all_rules.$c.$i.$ct.note %]
>+ [% SET maxissueqty = all_rules.$c.$i.$ct.maxissueqty %]
>+ [% SET issuelength = all_rules.$c.$i.$ct.issuelength %]
>+ [% SET daysmode = all_rules.$c.$i.$ct.daysmode %]
>+ [% SET lengthunit = all_rules.$c.$i.$ct.lengthunit %]
>+ [% SET hardduedate = all_rules.$c.$i.$ct.hardduedate %]
>+ [% SET hardduedatecompare = all_rules.$c.$i.$ct.hardduedatecompare %]
>+ [% SET fine = all_rules.$c.$i.$ct.fine %]
>+ [% SET chargeperiod = all_rules.$c.$i.$ct.chargeperiod %]
>+ [% SET chargeperiod_charge_at = all_rules.$c.$i.$ct.chargeperiod_charge_at %]
>+ [% SET firstremind = all_rules.$c.$i.$ct.firstremind %]
>+ [% SET overduefinescap = all_rules.$c.$i.$ct.overduefinescap %]
>+ [% SET cap_fine_to_replacement_price = all_rules.$c.$i.$ct.cap_fine_to_replacement_price %]
>+ [% SET finedays = all_rules.$c.$i.$ct.finedays %]
>+ [% SET maxsuspensiondays = all_rules.$c.$i.$ct.maxsuspensiondays %]
>+ [% SET suspension_chargeperiod = all_rules.$c.$i.$ct.suspension_chargeperiod %]
>+ [% SET renewalsallowed = all_rules.$c.$i.$ct.renewalsallowed %]
>+ [% SET renewalperiod = all_rules.$c.$i.$ct.renewalperiod %]
>+ [% SET norenewalbefore = all_rules.$c.$i.$ct.norenewalbefore %]
>+ [% SET auto_renew = all_rules.$c.$i.$ct.auto_renew %]
>+ [% SET no_auto_renewal_after = all_rules.$c.$i.$ct.no_auto_renewal_after %]
>+ [% SET no_auto_renewal_after_hard_limit = all_rules.$c.$i.$ct.no_auto_renewal_after_hard_limit %]
>+ [% SET reservesallowed = all_rules.$c.$i.$ct.reservesallowed %]
>+ [% SET holds_per_day = all_rules.$c.$i.$ct.holds_per_day %]
>+ [% SET holds_per_record = all_rules.$c.$ct.$i.holds_per_record %]
>+ [% SET onshelfholds = all_rules.$c.$i.$ct.onshelfholds %]
>+ [% SET opacitemholds = all_rules.$c.$i.$ct.opacitemholds %]
>+ [% SET article_requests = all_rules.$c.$ct.$i.article_requests %]
>+ [% SET rentaldiscount = all_rules.$c.$i.$ct.rentaldiscount %]
> 
>- [% SET show_rule = note || maxissueqty || issuelength || daysmode || lengthunit || hardduedate || hardduedatecompare || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || renewalperiod || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || rentaldiscount %]
>- [% IF show_rule %]
>- [% SET row_count = row_count + 1 %]
>- <tr row_countd="row_[% row_count | html %]">
>- <td>
>- [% IF ct == undef %]
>- All
>- [% ELSE %]
>- [% IF ct == 'CHECKOUT' %]
>- Normal checkout
>- [% ELSIF ct == 'ONSITE' %]
>- On-site checkout
>+ [% SET show_rule = note || maxissueqty || issuelength || daysmode || lengthunit || hardduedate || hardduedatecompare || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || renewalsallowed || renewalperiod || norenewalbefore || auto_renew || no_auto_renewal_after || no_auto_renewal_after_hard_limit || reservesallowed || holds_per_day || holds_per_record || onshelfholds || opacitemholds || article_requests || rentaldiscount %]
>+ [% IF show_rule %]
>+ [% SET row_count = row_count + 1 %]
>+ <tr row_countd="row_[% row_count | html %]">
>+ <td>
>+ [% IF ct == undef %]
>+ All
>+ [% ELSE %]
>+ [% IF ct == 'CHECKOUT' %]
>+ Normal checkout
>+ [% ELSIF ct == 'ONSITE' %]
>+ On-site checkout
>+ [% END %]
> [% END %]
>- [% END %]
>- </td>
>- <td>
>- [% IF c == undef %]
>- All
>- [% ELSE %]
>- [% Categories.GetName(c) | html %]
>- [% END %]
>- </td>
>- <td>
>- [% IF i == undef %]
>- All
>- [% ELSE %]
>- [% ItemTypes.GetDescription(i) | html %]
>- [% END %]
>- </td>
>- <td class="actions">
>- <a href="#" class="editrule btn btn-default btn-xs"> Edit</a>
>- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;checkout_type=[% ct || '*' | html %]&amp;itemtype=[% i || '*' | html %]&amp;categorycode=[% c || '*' | html %]&amp;branch=[% current_branch | html %]"> Delete</a>
>- </td>
>- <td>
>- [% IF note.defined && note != '' %]
>- <a name="viewnote" data-toggle="popover" title="Note" data-content="[% note | html %]" data-placement="top" data-trigger="hover">View note</a>
>- [% ELSE %]&nbsp;[% END %]
>- </td>
>- <td>
>- [% IF maxissueqty.defined && maxissueqty != '' %]
>- [% maxissueqty | html %]
>- [% ELSE %]
>- Unlimited
>- [% END %]
>- </td>
>- <td>[% issuelength | html %]</td>
>- <td>
>- [% SWITCH daysmode %]
>- [% CASE 'Calendar' %]Calendar
>- [% CASE 'Datedue' %]Datedue
>- [% CASE 'Days' %]Days
>- [% CASE 'Dayweek' %]Dayweek
>- [% CASE %]Default
>- [% END %]
>- </td>
>- <td>
>- [% IF ( lengthunit == 'days' ) %]
>- Days
>- [% ELSIF ( lengthunit == 'hours') %]
>- Hours
>- [% ELSE %]
>- Undefined
>- [% END %]
>- </td>
>- <td>
>- [% IF ( hardduedate ) %]
>- [% IF ( hardduedatecompare == '-1' ) %]
>- before [% hardduedate | $KohaDates %]
>- <input type="hidden" name="hardduedatecomparebackup" value="-1" />
>- [% ELSIF ( hardduedatecompare == '0' ) %]
>- on [% hardduedate | $KohaDates %]
>- <input type="hidden" name="hardduedatecomparebackup" value="0" />
>- [% ELSIF ( hardduedatecompare == '1' ) %]
>- after [% hardduedate | $KohaDates %]
>- <input type="hidden" name="hardduedatecomparebackup" value="1" />
>- [% END %]
>- [% ELSE %]
>- None defined
>- [% END %]
>- </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 | html %]</td>
>- <td>[% overduefinescap FILTER format("%.2f") %]</td>
>- <td>
>- [% IF cap_fine_to_replacement_price %]
>- <input type="checkbox" checked="checked" disabled="disabled" />
>- [% ELSE %]
>- <input type="checkbox" disabled="disabled" />
>- [% END %]
>- </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 %]
>- Yes
>- [% ELSE %]
>- No
>- [% END %]
>- </td>
>- <td>[% no_auto_renewal_after | html %]</td>
>- <td>[% no_auto_renewal_after_hard_limit | $KohaDates %]</td>
>- <td>
>- [% IF reservesallowed.defined && reservesallowed != '' %]
>- [% reservesallowed | html %]
>- [% ELSE %]
>- Unlimited
>- [% END %]
>- </td>
>- <td>
>- [% IF holds_per_day.defined && holds_per_day != '' %]
>- [% holds_per_day | html %]
>- [% ELSE %]
>- Unlimited
>- [% END %]
>- </td>
>- <td>
>- [% IF holds_per_record.defined && holds_per_record != '' %]
>- [% holds_per_record | html %]
>- [% ELSE %]
>- Unlimited
>- [% END %]
>- </td>
>- <td>
>- [% IF onshelfholds == 1 %]
>- Yes
>- [% ELSIF onshelfholds == 2 %]
>- If all unavailable
>- [% ELSE %]
>- If any unavailable
>- [% END %]
>- </td>
>- <td>
>- [% IF opacitemholds == 'F'%]
>- Force
>- [% ELSIF opacitemholds == 'Y'%]
>- Allow
>- [% ELSE %]
>- Don't allow
>- [% END %]
>- </td>
>- <td>
>- [% IF article_requests == 'no' %]
>- No
>- [% ELSIF article_requests == 'yes' %]
>- Yes
>- [% ELSIF article_requests == 'bib_only' %]
>- Record only
>- [% ELSIF article_requests == 'item_only' %]
>- Item only
>- [% END %]
>- </td>
>- <td>[% rentaldiscount | html %]</td>
>- <td class="actions">
>- <a href="#" class="editrule btn btn-default btn-xs"> Edit</a>
>- <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% i || '*' | uri %]&amp;categorycode=[% c || '*' | uri %]&amp;branch=[% current_branch | uri %]"> Delete</a>
>- </td>
>- </tr>
>- [% END %]
>+ </td>
>+ <td>
>+ [% IF c == undef %]
>+ All
>+ [% ELSE %]
>+ [% Categories.GetName(c) | html %]
>+ [% END %]
>+ </td>
>+ <td>
>+ [% IF i == undef %]
>+ All
>+ [% ELSE %]
>+ [% ItemTypes.GetDescription(i) | html %]
>+ [% END %]
>+ </td>
>+ <td class="actions">
>+ <a href="#" class="editrule btn btn-default btn-xs"> Edit</a>
>+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;checkout_type=[% ct || '*' | html %]&amp;itemtype=[% i || '*' | html %]&amp;categorycode=[% c || '*' | html %]&amp;branch=[% current_branch | html %]"> Delete</a>
>+ </td>
>+ <td>
>+ [% IF note.defined && note != '' %]
>+ <a name="viewnote" data-toggle="popover" title="Note" data-content="[% note | html %]" data-placement="top" data-trigger="hover">View note</a>
>+ [% ELSE %]&nbsp;[% END %]
>+ </td>
>+ <td>
>+ [% IF maxissueqty.defined && maxissueqty != '' %]
>+ [% maxissueqty | html %]
>+ [% ELSE %]
>+ Unlimited
>+ [% END %]
>+ </td>
>+ <td>[% issuelength | html %]</td>
>+ <td>
>+ [% SWITCH daysmode %]
>+ [% CASE 'Calendar' %]Calendar
>+ [% CASE 'Datedue' %]Datedue
>+ [% CASE 'Days' %]Days
>+ [% CASE 'Dayweek' %]Dayweek
>+ [% CASE %]Default
>+ [% END %]
>+ </td>
>+ <td>
>+ [% IF ( lengthunit == 'days' ) %]
>+ Days
>+ [% ELSIF ( lengthunit == 'hours') %]
>+ Hours
>+ [% ELSE %]
>+ Undefined
>+ [% END %]
>+ </td>
>+ <td>
>+ [% IF ( hardduedate ) %]
>+ [% IF ( hardduedatecompare == '-1' ) %]
>+ before [% hardduedate | $KohaDates %]
>+ <input type="hidden" name="hardduedatecomparebackup" value="-1" />
>+ [% ELSIF ( hardduedatecompare == '0' ) %]
>+ on [% hardduedate | $KohaDates %]
>+ <input type="hidden" name="hardduedatecomparebackup" value="0" />
>+ [% ELSIF ( hardduedatecompare == '1' ) %]
>+ after [% hardduedate | $KohaDates %]
>+ <input type="hidden" name="hardduedatecomparebackup" value="1" />
>+ [% END %]
>+ [% ELSE %]
>+ None defined
>+ [% END %]
>+ </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 | html %]</td>
>+ <td>[% overduefinescap FILTER format("%.2f") %]</td>
>+ <td>
>+ [% IF cap_fine_to_replacement_price %]
>+ <input type="checkbox" checked="checked" disabled="disabled" />
>+ [% ELSE %]
>+ <input type="checkbox" disabled="disabled" />
>+ [% END %]
>+ </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 %]
>+ Yes
>+ [% ELSE %]
>+ No
>+ [% END %]
>+ </td>
>+ <td>[% no_auto_renewal_after | html %]</td>
>+ <td>[% no_auto_renewal_after_hard_limit | $KohaDates %]</td>
>+ <td>
>+ [% IF reservesallowed.defined && reservesallowed != '' %]
>+ [% reservesallowed | html %]
>+ [% ELSE %]
>+ Unlimited
>+ [% END %]
>+ </td>
>+ <td>
>+ [% IF holds_per_day.defined && holds_per_day != '' %]
>+ [% holds_per_day | html %]
>+ [% ELSE %]
>+ Unlimited
>+ [% END %]
>+ </td>
>+ <td>
>+ [% IF holds_per_record.defined && holds_per_record != '' %]
>+ [% holds_per_record | html %]
>+ [% ELSE %]
>+ Unlimited
>+ [% END %]
>+ </td>
>+ <td>
>+ [% IF onshelfholds == 1 %]
>+ Yes
>+ [% ELSIF onshelfholds == 2 %]
>+ If all unavailable
>+ [% ELSE %]
>+ If any unavailable
>+ [% END %]
>+ </td>
>+ <td>
>+ [% IF opacitemholds == 'F'%]
>+ Force
>+ [% ELSIF opacitemholds == 'Y'%]
>+ Allow
>+ [% ELSE %]
>+ Don't allow
>+ [% END %]
>+ </td>
>+ <td>
>+ [% IF article_requests == 'no' %]
>+ No
>+ [% ELSIF article_requests == 'yes' %]
>+ Yes
>+ [% ELSIF article_requests == 'bib_only' %]
>+ Record only
>+ [% ELSIF article_requests == 'item_only' %]
>+ Item only
>+ [% END %]
>+ </td>
>+ <td>[% rentaldiscount | html %]</td>
>+ <td class="actions">
>+ <a href="#" class="editrule btn btn-default btn-xs"> Edit</a>
>+ <a class="btn btn-default btn-xs delete" href="/cgi-bin/koha/admin/smart-rules.pl?op=delete&amp;itemtype=[% i || '*' | uri %]&amp;categorycode=[% c || '*' | uri %]&amp;branch=[% current_branch | uri %]"> Delete</a>
>+ </td>
>+ </tr>
>+ [% END %]
> [% END %]
> [% END %]
> [% END %]
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 25089: 103046 | 103047 | 103048 | 103049 | 103050 | 103051 | 103052 | 103053 | 103054 | 103239 | 103240 | 103241 | 103242 | 103243 | 103244 | 103245 | 103246 | 103247 | 103248 | 103283 | 103284 | 103285 | 103286 | 103287 | 103288 | 103289 | 103290 | 103291 | 103292 | 103339 | 103340 | 103341 | 103342 | 103343 | 103344 | 103345 | 103346 | 103347 | 103348 | 103349 | 103351 | 103352 | 103353 | 103354 | 103355 | 103356 | 103357 | 103358 | 103359 | 103360 | 103361 | 103537 | 103538 | 103539 | 103540 | 103541 | 103542 | 103543 | 103544 | 103545 | 103546 | 103547 | 104274 | 104275 | 107523 | 107524 | 107525 | 107526 | 107527 | 107528 | 107529 | 107530 | 107531 | 107532 | 107533