Bugzilla – Attachment 75630 Details for
Bug 11911
Add separate permission for managing suggestions
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 11911: Add a separate permission for managing suggestions
Bug-11911-Add-a-separate-permission-for-managing-s.patch (text/plain), 8.06 KB, created by
Séverine Queune
on 2018-05-29 12:51:04 UTC
(
hide
)
Description:
Bug 11911: Add a separate permission for managing suggestions
Filename:
MIME Type:
Creator:
Séverine Queune
Created:
2018-05-29 12:51:04 UTC
Size:
8.06 KB
patch
obsolete
>From 78d7316342fcf00ed16da6f5ef43935d0fac125f Mon Sep 17 00:00:00 2001 >From: Katrin Fischer <katrin.fischer.83@web.de> >Date: Fri, 18 May 2018 10:40:21 +0000 >Subject: [PATCH] Bug 11911: Add a separate permission for managing suggestions >MIME-Version: 1.0 >Content-Type: text/plain; charset=UTF-8 >Content-Transfer-Encoding: 8bit > >Without this patch only catalogue permission was required >for managing suggestions. This patch adds a new permission >in the acquisition module do manage suggestions and updates >staff user permissions accordingly. > >To test: >- Make sure there is a pending suggestion >- Create a few users with different permission sets: > - User 1: only catalogue > - User 2: any acquisition permission > - User 3: cataloguing permission >- Check all of them can access: /cgi-bin/koha/suggestion/suggestion.pl >- Apply the patch >- Verify all of them now have the suggestions_manage permission >- Verify everything displays correctly on: > - intranet start page > - patron account in staff > - acquisition start page > - suggestion page (try to access by URL too) >- Remove suggestions_manage for a staff user >- Repeat tests above, access should be denied/links not visible > >Bonus: >- Fixes the link on the acquisition start page for late orders > to mage the permissions of the page itself: order_receive > >Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr> >--- > .../data/mysql/atomicupdate/bug11911_suggestions_permission.sql | 6 ++++++ > installer/data/mysql/userpermissions.sql | 1 + > koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc | 6 +++--- > koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc | 2 +- > koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc | 1 + > koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 2 +- > members/purchase-suggestions.pl | 2 +- > suggestion/suggestion.pl | 2 +- > 8 files changed, 15 insertions(+), 7 deletions(-) > create mode 100644 installer/data/mysql/atomicupdate/bug11911_suggestions_permission.sql > >diff --git a/installer/data/mysql/atomicupdate/bug11911_suggestions_permission.sql b/installer/data/mysql/atomicupdate/bug11911_suggestions_permission.sql >new file mode 100644 >index 0000000..9ce0fbc >--- /dev/null >+++ b/installer/data/mysql/atomicupdate/bug11911_suggestions_permission.sql >@@ -0,0 +1,6 @@ >+INSERT INTO permissions (module_bit, code, description) VALUES (11, 'suggestions_manage', 'Manage purchase suggestions'); >+ >+INSERT INTO user_permissions (borrowernumber, module_bit, code) >+ SELECT borrowernumber, 11, 'suggestions_manage' FROM borrowers WHERE flags & (1 << 2); >+ >+-- Bug 19911: Add new permission suggestions_manage and update staff users >diff --git a/installer/data/mysql/userpermissions.sql b/installer/data/mysql/userpermissions.sql >index 047ec42..04a3151 100644 >--- a/installer/data/mysql/userpermissions.sql >+++ b/installer/data/mysql/userpermissions.sql >@@ -17,6 +17,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES > ( 9, 'delete_all_items', 'Delete all items at once'), > (10, 'writeoff', 'Write off fines and fees'), > (10, 'remaining_permissions', 'Remaining permissions for managing fines and fees'), >+ (11, 'suggestions_manage', 'Manage purchase suggestions'), > (11, 'vendors_manage', 'Manage vendors'), > (11, 'contracts_manage', 'Manage contracts'), > (11, 'period_manage', 'Manage periods'), >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >index 8d46d87..7fc3d63 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc >@@ -3,9 +3,9 @@ > <h5>Acquisitions</h5> > <ul> > <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions home</a></li> >- <li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li> >- [% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %] >- <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li> >+ [% IF ( CAN_user_acquisition_order_receive ) %]<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>[% END %] >+ [% IF ( suggestion && CAN_user_acquisition_suggestions_manage ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %] >+ <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li> > [% IF CAN_user_acquisition_edi_manage %] > <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >index dcdf1cc..fb56a01 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc >@@ -109,7 +109,7 @@ > [% END %] > [% END %] > >- [% IF CAN_user_borrowers_edit_borrowers %] >+ [% IF CAN_user_acquisition_suggestions_manage %] > [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber %]">Purchase suggestions</a></li> > [% END %] > [% IF CAN_user_borrowers_edit_borrowers && useDischarge %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >index 017ffb9..96ca2b2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc >@@ -45,6 +45,7 @@ > [%- CASE 'fast_cataloging' -%]<span>Fast cataloging</span> > [%- CASE 'remaining_permissions' -%]<span>Remaining permissions for managing fines and fees</span> > [%- CASE 'writeoff' -%]<span>Write off fines and fees</span> >+ [%- CASE 'suggestions_manage' -%]<span>Manage purchase suggestions</span> > [%- CASE 'budget_add_del' -%]<span>Add and delete budgets (but can't modify budgets)</span> > [%- CASE 'budget_manage' -%]<span>Manage budgets</span> > [%- CASE 'budget_manage_all' -%]<span>Manage all budgets</span> >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 8a97473..f68b679 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -135,7 +135,7 @@ > </div> > [% END %] > >- [% IF ( CAN_user_acquisition && pendingsuggestions ) %] >+ [% IF ( CAN_user_acquisition_suggestions_manage && pendingsuggestions ) %] > <div class="pending-info" id="suggestions_pending"> > > <a href="/cgi-bin/koha/suggestion/suggestion.pl#ASKED">Suggestions pending approval</a>: >diff --git a/members/purchase-suggestions.pl b/members/purchase-suggestions.pl >index 026ab89..8e4b76a 100755 >--- a/members/purchase-suggestions.pl >+++ b/members/purchase-suggestions.pl >@@ -35,7 +35,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( > query => $input, > type => "intranet", > authnotrequired => 0, >- flagsrequired => { borrowers => 'edit_borrowers' }, >+ flagsrequired => { acquisition => 'suggestions_manage' }, > debug => 1, > } > ); >diff --git a/suggestion/suggestion.pl b/suggestion/suggestion.pl >index 98fcca4..1604d62 100755 >--- a/suggestion/suggestion.pl >+++ b/suggestion/suggestion.pl >@@ -111,7 +111,7 @@ my ( $template, $borrowernumber, $cookie, $userflags ) = get_template_and_user( > template_name => "suggestion/suggestion.tt", > query => $input, > type => "intranet", >- flagsrequired => { catalogue => 1 }, >+ flagsrequired => { acquisition => 'suggestions_manage' }, > } > ); > >-- >2.1.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 11911
:
75448
|
75616
|
75630
|
75631
|
75736
|
75737