From 9c8d3b43f4f5008e3141970a6110fa61e62fd45b Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 24 Mar 2015 15:54:37 +0100 Subject: [PATCH] [SIGNED-OFF] Bug 4502: Catch software error if no active budget defined TEST PLAN --------- 0) Back up your database. 1) In mysql client: > DROP DATABASE {your koha database name}; > CREATE DATABASE {your koha database name}; > QUIT; 2) Go to the staff client, and install all the default and optional things -- except patrons. :) 3) Log into staff client. 4) Create a patron -> New Patron -> Staff 5) Enter data and Save 6) More -> Set Permissions 7) Make superlibrarian 8) Log out 9) Log in as new superlibrarian 10) Acquisitions -> Budgets -> New Budget 11) Enter a non-active budget with some funds. -- Once saved, it should list in the inactive budgets. 12) Click on the name. 13) Click on one of the Planning submenu options. 14) Click the 'Submit' button in the Filter area. -- This should trigger the blow up. 15) Apply the patch 16) Repeat steps 12-15 -- The kaboom is avoided and a nice message given. NOTE: This does not solve all the problems in this ugly, ugly module area. It does solve the one thing it is meant to: that nasty kaboom. Signed-off-by: Mark Tompsett Signed-off-by: Bernardo Gonzalez Kriegel --- admin/aqplan.pl | 4 ++++ .../intranet-tmpl/prog/en/modules/admin/aqplan.tt | 2 ++ 2 files changed, 6 insertions(+) diff --git a/admin/aqplan.pl b/admin/aqplan.pl index 864c5b0..57b6adf 100755 --- a/admin/aqplan.pl +++ b/admin/aqplan.pl @@ -106,6 +106,10 @@ if ( $budget_period_locked == 1 && not defined $show_actual ) { $authcat = 'Asort1' if not defined $authcat; # defaults to Asort if no authcat given +# If no active budget is defined, budget_period_id is undef +# This is the behavior of GetBudgetPeriod +$authcat = '' unless $budget_period_id; + my $budget_id = $input->param('budget_id'); my $op = $input->param("op"); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt index abfe5de..fdf84b6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -225,6 +225,8 @@ + [% ELSIF not budget_period_id %] +
No active budget defined. You should define one before continuing.
[% ELSE %]
No funds to display for this search criteria
[% END %] -- 1.7.9.5