@@ -, +, @@ counts if the numbers differ 0 - Be in staff client as a superlibrarian 1 - Place some suggestions 1 for any branch 1 for signed in branch 1 for another branch 2 - Go to Koha main page, 3 suggestions pending 3 - Click 'Suggestions pending approval' - you see one suggestion 4 - Click on 'Acquisitions' in breadcrumbs , 3 suggestions pending 5 - Click manage suggestions - you see one suggestion 6 - Apply patch 7 - On mainpage and acqui-home you now see "Centerville: 1 / All libraries: 3" suggestions 8 - Confirm that the links take you to suggestions view of your branch or all libraries respectively 9 - Turn on IndependentBranches --- acqui/acqui-home.pl | 11 ++++++++--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 13 ++++++++++++- koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 13 +++++++++++-- mainpage.pl | 13 ++++++++++--- 4 files changed, 41 insertions(+), 9 deletions(-) --- a/acqui/acqui-home.pl +++ a/acqui/acqui-home.pl @@ -35,9 +35,9 @@ use C4::Acquisition; use C4::Budgets; use C4::Members; use C4::Debug; -use C4::Suggestions; use Koha::Acquisition::Currencies; use Koha::Patrons; +use Koha::Suggestions; my $query = CGI->new; my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( @@ -51,7 +51,12 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( ); my $status = $query->param('status') || "ASKED"; -my $suggestions_count = CountSuggestion($status); +# Get current branch count and total viewable count, if they don't match then pass +# both to template +my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED" }); +my $local_pendingsuggestions_count = $pendingsuggestions->filter_by_user_branch(1)->count(); +my $pendingsuggestions_count = $pendingsuggestions->filter_by_user_branch()->count(); +$template->param( all_pendingsuggestions => $pendingsuggestions_count != $local_pendingsuggestions_count ? $pendingsuggestions_count : 0 ); my $budget_arr = GetBudgetHierarchy; @@ -114,7 +119,7 @@ $template->param( totspent_active => $totspent_active, totordered_active => $totordered_active, totavail_active => $totavail_active, - suggestions_count => $suggestions_count, + suggestions_count => $local_pendingsuggestions_count, ); my $cur = Koha::Acquisition::Currencies->get_active; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -54,7 +54,18 @@