From fed3b06a6051b9c3a08e84a8edbbf51527d17543 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Wed, 1 Apr 2020 12:38:02 +0000 Subject: [PATCH] Bug 25033: Display both local and all pending suggestions counts if the numbers differ To test: 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 10 - Create a user with acquisition and suggestions permissions but not superlibrarian in one of the branches used above 11 - Sign in as that user 11 - See "Centerville: 1" suggestion on mainpage and on acqui home --- 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(-) diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl index 9c70773f8f..b1ef975f75 100755 --- a/acqui/acqui-home.pl +++ b/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; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index 83dc7e30d1..fcd3594d24 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -54,7 +54,18 @@
Pending suggestions -

[% suggestions_count | html %] suggestions waiting. Manage suggestions.

+

+ Manage suggestions: + + [% LoginBranchname | html %]: [% suggestions_count | html %] + + [% IF (all_pendingsuggestions > 0) %] + / + + All libraries: [% all_pendingsuggestions | html %] + + [% END %] +

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt index f6a213523e..138661c208 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt @@ -1,6 +1,7 @@ [% USE raw %] [% USE Asset %] [% USE Koha %] +[% USE Branches %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha staff client @@ -147,8 +148,16 @@ [% IF ( CAN_user_suggestions_suggestions_manage && pendingsuggestions ) %]
- Suggestions pending approval: - [% pendingsuggestions | html %] + Suggestions pending approval: + + [% LoginBranchname | html %]: [% pendingsuggestions | html %] + + [% IF (all_pendingsuggestions > 0) %] + / + + All libraries: [% all_pendingsuggestions | html %] + + [% END %]
[% END %] diff --git a/mainpage.pl b/mainpage.pl index 49f46fc272..47dfeaff58 100755 --- a/mainpage.pl +++ b/mainpage.pl @@ -25,12 +25,12 @@ use C4::Output; use C4::Auth; use C4::Koha; use C4::NewsChannels; # GetNewsToDisplay -use C4::Suggestions qw/CountSuggestion/; use C4::Tags qw/get_count_by_tag_status/; use Koha::Patron::Modifications; use Koha::Patron::Discharge; use Koha::Reviews; use Koha::ArticleRequests; +use Koha::Suggestions; my $query = new CGI; @@ -65,7 +65,14 @@ my $branch = my $pendingcomments = Koha::Reviews->search_limited({ approved => 0 })->count; my $pendingtags = get_count_by_tag_status(0); -my $pendingsuggestions = CountSuggestion("ASKED"); + +# 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 $pending_borrower_modifications = Koha::Patron::Modifications->pending_count( $branch ); my $pending_discharge_requests = Koha::Patron::Discharge::count({ pending => 1 }); my $pending_article_requests = Koha::ArticleRequests->search_limited( @@ -78,7 +85,7 @@ my $pending_article_requests = Koha::ArticleRequests->search_limited( $template->param( pendingcomments => $pendingcomments, pendingtags => $pendingtags, - pendingsuggestions => $pendingsuggestions, + pendingsuggestions => $local_pendingsuggestions_count, pending_borrower_modifications => $pending_borrower_modifications, pending_discharge_requests => $pending_discharge_requests, pending_article_requests => $pending_article_requests, -- 2.11.0