From e0a93f14c96e80da3880ef1907f68d37c9413eab Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 11 Jun 2019 10:44:25 -0500 Subject: [PATCH] Bug 23095: Correctly display circulation rules (0 vs undef) From the following commit: commit d1303ca834dd0b08fc1d44476cfbbb8b729b6165 Bug 18925: (follow-up) Fix null/empty behavior The global test must have been adjusted as well to catch empty strings. Actually we are expecting the plugin to return undef but the template variable contains an empty string. So the test should only be [% IF var != '' %] instead of [% IF var.defined && var != '' %] but I prefer to keep it as it for now. Test plan: In the section "Default checkout, hold policy by patron category" Set total checkouts = blank total on-site checkouts = blank total holds = 0 Save => Without this patch the line will not appear => With this patch applied there must be "unlimited, unlimited, 0" Signed-off-by: Mark Tompsett Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize (cherry picked from commit 3de89b98ce373818c4b6f5a0a90b8786996e6cfe) Signed-off-by: Fridolin Somers --- 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 a2a6e3f757..b71c172a98 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 @@ -538,7 +538,7 @@ [% SET patron_maxonsiteissueqty = CirculationRules.Search( branchcode, c, undef, 'patron_maxonsiteissueqty' ) %] [% SET max_holds = CirculationRules.Search( branchcode, c, undef, 'max_holds' ) %] - [% IF patron_maxissueqty || patron_maxonsiteissueqty || max_holds %] + [% IF ( patron_maxissueqty.defined && patron_maxissueqty != '' ) || ( patron_maxonsiteissueqty.defined && patron_maxonsiteissueqty != '' ) || ( max_holds.defined && max_holds != '' ) %] [% IF c == '*'%] -- 2.39.5