From 96d5cb5a5acc4d5c8db69d3050f3497d930e1494 Mon Sep 17 00:00:00 2001 From: Andrew Nugged Date: Sun, 10 May 2020 18:51:41 +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. --- 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 5ae3bb94e1..1c9e1a682f 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 || hardduedatecompare || renewalperiod || rentaldiscount || maxissueqty || maxonsiteissueqty || issuelength || lengthunit || hardduedate || fine || chargeperiod || chargeperiod_charge_at || firstremind || overduefinescap || cap_fine_to_replacement_price || finedays || maxsuspensiondays || suspension_chargeperiod || 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 %] [% IF show_rule %] [% SET row_count = row_count + 1 %] -- 2.17.1