Attachment 105985 Details for Bug 25440 – Bug 25440: Fixed list of 'show_rule' forming variables in the template

[patch] Bug 25440: Fixed list of 'show_rule' forming variables in the template

Bug-25440-Fixed-list-of-showrule-forming-variables.patch (text/plain), 2.99 KB, created by Andrii Nugged on 2020-06-17 20:31:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrii Nugged

Created: 2020-06-17 20:31:15 UTC

Size: 2.99 KB

patch

obsolete

>From 9218980343c02973f203e7433d03fb1817ee5d44 Mon Sep 17 00:00:00 2001
>From: Andrew Nugged <nugged@gmail.com>
>Date: Wed, 17 Jun 2020 23:18:01 +0300
>Subject: [PATCH] Bug 25440: Fixed list of 'show_rule' forming variables in the
> template
>
>In smart-rules.tt we have `SET show_rule = ...` section which filled
>with 'all used in the loop' variables. Because if historical reasons it
>seems that there are some missing, few old, and even doubled ones.
>This list is fixed now by:
>
>  - variable names 'article_requests' and 'renewalsallowed' repeated
>    so duplicates are removed;
>
>  - 'hardduedatebefore' and 'hardduedateexact' not present in the whole
>    site code anywhere anymore;
>    IMPORTANT NOTE: these 'hardduedatebefore/hardduedateexact' also
>                    exists as remnants in .po-translation files, a lot.
>
>  - 'note', 'hardduedatecompare', 'renewalperiod', 'rentaldiscount'
>    template variables were missing from this 'show_rule =' checking
>    code so they are added.
>
>Order of fields updated to match with above "SET field = ..." pack.
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>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 61f36a1788..27aaa33456 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
>@@ -156,7 +156,7 @@
>                         [% SET article_requests = all_rules.$c.$i.article_requests %]
>                         [% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %]
> 
>-                        [% 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 %]
>+                        [% SET show_rule = note || maxissueqty || maxonsiteissueqty || issuelength || engthunit || 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 %]">
>-- 
>2.17.1

Actions: View | Diff | Splinter Review

Attachments on bug 25440: 104635 | 104636 | 104637 | 104638 | 104639 | 104640 | 105059 | 105063 | 105985 | 106300 | 106301 | 106302 | 106303 | 106304 | 106305 | 106388