From e3d72d638970c2c97ee69d533f4f19a14146926a Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 18 Jul 2018 13:55:19 -0400 Subject: [PATCH] Bug 18887: Fix issues caused by rebase --- admin/smart-rules.pl | 5 ++--- koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/admin/smart-rules.pl b/admin/smart-rules.pl index 24d4b39ee4..8207f26634 100755 --- a/admin/smart-rules.pl +++ b/admin/smart-rules.pl @@ -325,14 +325,13 @@ elsif ($op eq "add-branch-cat") { WHERE categorycode = ?"); my $sth_insert = $dbh->prepare(q| INSERT INTO default_borrower_circ_rules - (categorycode, maxissueqty, maxonsiteissueqty, max_holds) - VALUES (?, ?, ?, ?) + (categorycode, maxissueqty, maxonsiteissueqty) + VALUES ( ?, ?, ?) |); my $sth_update = $dbh->prepare(q| UPDATE default_borrower_circ_rules SET maxissueqty = ?, maxonsiteissueqty = ?, - max_holds = ? WHERE categorycode = ? |); $sth_search->execute($categorycode); 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 76046137c7..bd2ed426dc 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 @@ -518,7 +518,7 @@ [% END %] - [% SET rule_value = CirculationRules.Get( branch_cat_rule_loo.branchcode, branch_cat_rule_loo.categorycode, branch_cat_rule_loo.itemtype, 'max_holds' ) %] + [% SET rule_value = CirculationRules.Get( branch_cat_rule_loo.branchcode || '*', branch_cat_rule_loo.categorycode, branch_cat_rule_loo.itemtype, 'max_holds' ) %] [% IF rule_value.defined && rule_value != '' %] [% rule_value %] [% ELSE %] -- 2.11.0