From c81c1b7ba35e2690ead5526c724c71061bee4013 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 13 Mar 2019 09:37:59 +0000 Subject: [PATCH] Bug 22489: (follow-up) Correctly set success messages The original patch was duplicating the success message upon successful circ rule insertion. This corrects that. Signed-off-by: Martin Renvoize Signed-off-by: Liz Rea --- installer/onboarding.pl | 40 +++++++++++++++++++--------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/installer/onboarding.pl b/installer/onboarding.pl index 5ec6550772..77aa12018a 100755 --- a/installer/onboarding.pl +++ b/installer/onboarding.pl @@ -261,31 +261,29 @@ if ( $step == 5 ) { my $issuingrule = Koha::IssuingRule->new($params); eval { $issuingrule->store; }; - unless ($@) { - push @messages, { code => 'success_on_insert_circ_rule' }; - } - else { + if ($@) { push @messages, { code => 'error_on_insert_circ_rule' }; - } + } else { - eval { - Koha::CirculationRules->set_rules( - { - categorycode => $categorycode, - itemtype => $itemtype, - branchcode => $branchcode, - rules => { - maxissueqty => $maxissueqty, + eval { + Koha::CirculationRules->set_rules( + { + categorycode => $categorycode, + itemtype => $itemtype, + branchcode => $branchcode, + rules => { + maxissueqty => $maxissueqty, + } } - } - ); - }; + ); + }; - unless ($@) { - push @messages, { code => 'success_on_insert_circ_rule' }; - } - else { - push @messages, { code => 'error_on_insert_circ_rule' }; + unless ($@) { + push @messages, { code => 'success_on_insert_circ_rule' }; + } + else { + push @messages, { code => 'error_on_insert_circ_rule' }; + } } } -- 2.11.0