Attachment 128399 Details for Bug 29571 – Bug 29571: Display all pending suggestions even if none from logged in library

[patch] Bug 29571: Display all pending suggestions even if none from logged in library

Bug-29571-Display-all-pending-suggestions-even-if-.patch (text/plain), 3.34 KB, created by Andreas Roussos on 2021-12-10 14:41:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Roussos

Created: 2021-12-10 14:41:34 UTC

Size: 3.34 KB

patch

obsolete

>From a606477ef1fc4fd8f3665d26be0bed05f44a83dc Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 25 Nov 2021 14:06:07 +0100
>Subject: [PATCH] Bug 29571: Display all pending suggestions even if none from
> logged in library
>
>The number of pending suggestions was only displayed if there are pending
>suggestions at the logged in library.
>
>Test plan:
>Login at CPL
>Create a suggestion (ASKED) for another library
>=> Without this patch there is nothing on the mainpage
>=> With this patch applied you will see info about pending suggestions:
>
>"Suggestions pending approval: Centerville: 0 / All libraries: 1"
>
>Signed-off-by: David Nind <david@davidnind.com>
>Signed-off-by: ThibaudGLT <thibaud.guillot@biblibre.com>
>Signed-off-by: Andreas Roussos <a.roussos@dataly.gr>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>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 cf7f0300e3..45943d3608 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>@@ -165,7 +165,7 @@
>                 <div class="row">
>                     <div class="col-sm-12">
>                         [%# Following statement must be in one line for translatability %]
>-                        [% IF ( CAN_user_tools_moderate_comments  && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_suggestions_suggestions_manage && pendingsuggestions ) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests || ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) || ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) || already_ran_jobs %]
>+                        [% IF ( CAN_user_tools_moderate_comments  && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_suggestions_suggestions_manage && ( pendingsuggestions || all_pendingsuggestions )) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests || ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) || ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) || already_ran_jobs %]
>                             <div id="area-pending">
>                                 [% IF pending_article_requests %]
>                                 <div class="pending-info" id="article_requests_pending">
>@@ -175,7 +175,7 @@
>                                 </div>
>                                 [% END %]
> 
>-                                [% IF ( CAN_user_suggestions_suggestions_manage && pendingsuggestions ) %]
>+                                [% IF CAN_user_suggestions_suggestions_manage && ( pendingsuggestions || all_pendingsuggestions ) %]
>                                 <div class="pending-info" id="suggestions_pending">
> 
>                                     Suggestions pending approval:
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 29571: 128010 | 128060 | 128271 | 128399 | 128426 | 128473 | 128710 | 128711