From 0b14b1958f2cd7cfc3d5d00f6a8f6e2e02bb8d2c Mon Sep 17 00:00:00 2001 From: Andrew Nugged 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. Signed-off-by: Martin Renvoize --- 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 ce3531596d..a962df0742 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 @@ -158,7 +158,7 @@ [% SET article_requests = all_rules.$c.$i.article_requests %] [% SET rentaldiscount = all_rules.$c.$i.rentaldiscount %] - [% SET show_rule = maxissueqty || maxonsiteissueqty || issuelength || daysmode || 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 || daysmode || 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 %] -- 2.20.1