From a7187bb005296eb45cf08b8f564e030c8d2dd6c7 Mon Sep 17 00:00:00 2001 From: Aleisha Amohia Date: Mon, 22 Jan 2018 23:52:21 +0000 Subject: [PATCH] Bug 20068: Check if user logged in before passing dashboard params to template This prevents warns from dashboard variables when not logged in To test: 1) Go to OPAC main homepage. Do not log in 2) Notice warn 3) Apply patch and refresh 4) Warn should be gone 5) Log in 6) Confirm dashboard shows as normal Sponsored-by: Catalyst IT --- opac/opac-main.pl | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/opac/opac-main.pl b/opac/opac-main.pl index 33e100f..b007b81 100755 --- a/opac/opac-main.pl +++ b/opac/opac-main.pl @@ -67,22 +67,27 @@ my $koha_news_count = scalar @$all_koha_news; my $quote = GetDailyQuote(); # other options are to pass in an exact quote id or select a random quote each pass... see perldoc C4::Koha # For dashboard -my $checkouts = Koha::Checkouts->search({ borrowernumber => $borrowernumber })->count; -my ( $overdues_count, $overdues ) = checkoverdues($borrowernumber); -my $holds_pending = Koha::Holds->search({ borrowernumber => $borrowernumber, found => undef })->count; -my $holds_waiting = Koha::Holds->search({ borrowernumber => $borrowernumber })->waiting->count; -my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber ); - -if ( $checkouts > 0 || $overdues_count > 0 || $holds_pending > 0 || $holds_waiting > 0 || $total > 0 ) { - $template->param( dashboard_info => 1 ); +if ( defined $borrowernumber ){ + my $checkouts = Koha::Checkouts->search({ borrowernumber => $borrowernumber })->count; + my ( $overdues_count, $overdues ) = checkoverdues($borrowernumber); + my $holds_pending = Koha::Holds->search({ borrowernumber => $borrowernumber, found => undef })->count; + my $holds_waiting = Koha::Holds->search({ borrowernumber => $borrowernumber })->waiting->count; + my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber ); + + if ( $checkouts > 0 || $overdues_count > 0 || $holds_pending > 0 || $holds_waiting > 0 || $total > 0 ) { + $template->param( dashboard_info => 1 ); + } + + $template->param( + checkouts => $checkouts, + overdues => $overdues_count, + holds_pending => $holds_pending, + holds_waiting => $holds_waiting, + total_owing => $total, + ); } $template->param( - checkouts => $checkouts, - overdues => $overdues_count, - holds_pending => $holds_pending, - holds_waiting => $holds_waiting, - total_owing => $total, koha_news => $all_koha_news, koha_news_count => $koha_news_count, branchcode => $homebranch, -- 2.1.4