Attachment 102694 Details for Bug 25005 – Bug 25005: (bug 22868 follow-up) Fix suggestions pending on main page

[patch] Bug 25005: (bug 22868 follow-up) Fix suggestions pending on main page

Bug-25005-bug-22868-follow-up-Fix-suggestions-pend.patch (text/plain), 3.00 KB, created by Marcel de Rooy on 2020-04-10 10:21:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2020-04-10 10:21:59 UTC

Size: 3.00 KB

patch

obsolete

>From 852d28764c50d06850d7473e724259f285dce84a Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 7 Apr 2020 13:32:51 +0200
>Subject: [PATCH] Bug 25005: (bug 22868 follow-up) Fix suggestions pending on
> main page
>Content-Type: text/plain; charset=utf-8
>
>There is a "Suggestions pending approval" link on the main page that is
>displayed if there are new suggestions and the logged in user has the
>permission to manage them.
>
>On bug bug 22868 the permission changed from
>acquisition.suggestions_manage to suggestions.suggestions_manage
>
>But in the template, one occurrence has not been replaced correctly
>(certainly because it was already wrong actually).
>
>Test plan:
>Create a suggestion at the OPAC
>Create a patron with the suggestions permission
>Use this patron to login at the staff interface
>=> Without this patch the link does not appear on the main page
>=> With this patch applied the link appears
>
>Signed-off-by: David Roberts <david@koha-ptfs.co.uk>
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>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 e094e74e59..1ec2e3d852 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt
>@@ -134,7 +134,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_acquisition && 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 ) %]
>+                        [% 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 ) %]
>                             <div id="area-pending">
>                                 [% IF pending_article_requests %]
>                                 <div class="pending-info" id="article_requests_pending">
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 25005: 102510 | 102526 | 102694 | 104350