Attachment 104160 Details for Bug 25033 – Bug 25033: Display both local and all pending suggestions counts if the numbers differ

[patch] Bug 25033: Display both local and all pending suggestions counts if the numbers differ

Bug-25033-Display-both-local-and-all-pending-sugge.patch (text/plain), 8.78 KB, created by David Nind on 2020-05-02 01:06:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Nind

Created: 2020-05-02 01:06:40 UTC

Size: 8.78 KB

patch

obsolete

>From 9407cbe52b49886bd948cb82546a57c997bbe5c9 Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>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
>
>Signed-off-by: David Nind <david@davidnind.com>
>---
> acqui/acqui-home.pl                                 | 18 +++++++++++++++---
> .../prog/en/modules/acqui/acqui-home.tt             | 13 ++++++++++++-
> .../intranet-tmpl/prog/en/modules/intranet-main.tt  | 13 +++++++++++--
> mainpage.pl                                         | 21 ++++++++++++++++++---
> 4 files changed, 56 insertions(+), 9 deletions(-)
>
>diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
>index 9c70773f8f..e12307438f 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,20 @@ 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
>+if( C4::Context->only_my_library ){
>+    my $local_pendingsuggestions_count = Koha::Suggestions->search({ status => "ASKED", branchcode => C4::Context->userenv()->{'branch'} })->count();
>+    $template->param( suggestions_count => $local_pendingsuggestions_count );
>+} else {
>+    my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED" });
>+    my $local_pendingsuggestions_count = $pendingsuggestions->search({ 'me.branchcode' => C4::Context->userenv()->{'branch'} })->count();
>+    my $pendingsuggestions_count = $pendingsuggestions->count();
>+    $template->param(
>+        all_pendingsuggestions => $pendingsuggestions_count != $local_pendingsuggestions_count ? $pendingsuggestions_count : 0,
>+        suggestions_count => $local_pendingsuggestions_count
>+    );
>+}
> 
> my $budget_arr = GetBudgetHierarchy;
> 
>@@ -114,7 +127,6 @@ $template->param(
>     totspent_active     => $totspent_active,
>     totordered_active   => $totordered_active,
>     totavail_active     => $totavail_active,
>-    suggestions_count   => $suggestions_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..d69ee1a1c1 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 @@
>     <div id="acqui_acqui_home_suggestions">
>         <fieldset>
>         <legend>Pending suggestions</legend>
>-            <p>[% suggestions_count | html %] suggestions waiting. <a href="/cgi-bin/koha/suggestion/suggestion.pl#ASKED">Manage suggestions</a>.</p>
>+        <p>
>+            Manage suggestions:
>+            <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED">
>+                <span id="pendingsuggestions" class="pending-number-link">[% LoginBranchname | html %]: [% suggestions_count | html %]</span>
>+            </a>
>+            [% IF (all_pendingsuggestions > 0) %]
>+                /
>+                <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=__ANY__#ASKED">
>+                    <span id="all_pendingsuggestions" class="pending-number-link">All libraries: [% all_pendingsuggestions | html %]</span>
>+                </a>
>+            [% END %]
>+        </p>
>         </fieldset>
>     </div>
> </div>
>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 1ec2e3d852..243f2b3161 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' %]
> <title>Koha staff client</title>
>@@ -147,8 +148,16 @@
>                                 [% IF ( CAN_user_suggestions_suggestions_manage && pendingsuggestions ) %]
>                                 <div class="pending-info" id="suggestions_pending">
> 
>-                                    <a href="/cgi-bin/koha/suggestion/suggestion.pl#ASKED">Suggestions pending approval</a>:
>-                                    <span class="pending-number-link">[% pendingsuggestions | html %]</span>
>+                                    Suggestions pending approval:
>+                                    <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED">
>+                                    <span id="pendingsuggestions" class="pending-number-link">[% LoginBranchname | html %]: [% pendingsuggestions | html %]</span>
>+                                    </a>
>+                                    [% IF (all_pendingsuggestions > 0) %]
>+                                        /
>+                                        <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=__ANY__#ASKED">
>+                                            <span id="all_pendingsuggestions" class="pending-number-link">All libraries: [% all_pendingsuggestions | html %]</span>
>+                                        </a>
>+                                    [% END %]
>                                 </div>
>                                 [% END %]
> 
>diff --git a/mainpage.pl b/mainpage.pl
>index ff234f6baa..cd26a02d8d 100755
>--- a/mainpage.pl
>+++ b/mainpage.pl
>@@ -25,13 +25,13 @@ 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::ProblemReports;
>+use Koha::Suggestions;
> 
> my $query = new CGI;
> 
>@@ -66,7 +66,23 @@ 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
>+
>+if( C4::Context->only_my_library ){
>+    my $local_pendingsuggestions_count = Koha::Suggestions->search({ status => "ASKED", branchcode => C4::Context->userenv()->{'branch'} })->count();
>+    $template->param( pendingsuggestions => $local_pendingsuggestions_count );
>+} else {
>+    my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED" });
>+    my $local_pendingsuggestions_count = $pendingsuggestions->search({ 'me.branchcode' => C4::Context->userenv()->{'branch'} })->count();
>+    my $pendingsuggestions_count = $pendingsuggestions->count();
>+    $template->param(
>+        all_pendingsuggestions => $pendingsuggestions_count != $local_pendingsuggestions_count ? $pendingsuggestions_count : 0,
>+        pendingsuggestions => $local_pendingsuggestions_count
>+    );
>+}
>+
> 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(
>@@ -80,7 +96,6 @@ my $pending_problem_reports = Koha::ProblemReports->search({ status => 'New' });
> $template->param(
>     pendingcomments                => $pendingcomments,
>     pendingtags                    => $pendingtags,
>-    pendingsuggestions             => $pendingsuggestions,
>     pending_borrower_modifications => $pending_borrower_modifications,
>     pending_discharge_requests     => $pending_discharge_requests,
>     pending_article_requests       => $pending_article_requests,
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 25033: 102225 | 102226 | 102227 | 102228 | 102282 | 102283 | 102284 | 102285 | 102299 | 102300 | 102301 | 102302 | 102922 | 104091 | 104092 | 104093 | 104160 | 104161 | 104162 | 104357 | 104940 | 107831 | 108948 | 108949 | 108950 | 108951 | 108952 | 108953 | 108954 | 108984