Bugzilla – Attachment 121888 Details for
Bug 15788
Split borrowers permission into create/edit and delete
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 15788: Use delete_borrowers permission
Bug-15788-Use-deleteborrowers-permission.patch (text/plain), 4.81 KB, created by
Tomás Cohen Arazi (tcohen)
on 2021-06-12 14:00:23 UTC
(
hide
)
Description:
Bug 15788: Use delete_borrowers permission
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2021-06-12 14:00:23 UTC
Size:
4.81 KB
patch
obsolete
>From caec82ddf989199de5842c5bef7b405c6bd23cdd Mon Sep 17 00:00:00 2001 >From: Martin Renvoize <martin.renvoize@ptfs-europe.com> >Date: Tue, 12 Jan 2021 14:24:41 +0000 >Subject: [PATCH] Bug 15788: Use delete_borrowers permission > >Link the new delete_borrowers sub-permission to the delete actions. > >Test plan >1/ Remove the delete_borrowers permission from a staff user >2/ Check that the user cannot use the 'Delete' option from the members >menu. > >Signed-off-by: David Nind <david@davidnind.com> >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> >--- > .../prog/en/includes/members-toolbar.inc | 2 +- > .../prog/en/includes/str/members-menu.inc | 1 + > koha-tmpl/intranet-tmpl/prog/js/members-menu.js | 6 ++++-- > members/deletemem.pl | 17 +++++++++-------- > 4 files changed, 15 insertions(+), 11 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >index bb9abf4089..44d6f800a6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc >@@ -64,7 +64,7 @@ > [% END %] > [% END %] > >- [% IF CAN_user_borrowers_edit_borrowers %] >+ [% IF CAN_user_borrowers_delete_borrowers %] > <li><a id="deletepatron" href="#">Delete</a></li> > [% ELSE %] > <li class="disabled"><a data-toggle="tooltip" data-placement="left" title="You are not authorized to delete patrons" id="deletepatron" href="#">Delete</a></li> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc >index 6f47bda714..777f814f11 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc >+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc >@@ -7,6 +7,7 @@ > var destination = "[% destination | html %]"; > > var CAN_user_borrowers_edit_borrowers = "[% CAN_user_borrowers_edit_borrowers | html %]"; >+ var CAN_user_borrowers_delete_borrowers = "[% CAN_user_borrowers_delete_borrowers | html %]"; > > var dateformat = "[% Koha.Preference('dateformat') | html %]"; > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js b/koha-tmpl/intranet-tmpl/prog/js/members-menu.js >index 8ee2175bb1..def803d274 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/members-menu.js >@@ -1,4 +1,4 @@ >-/* global borrowernumber advsearch dateformat __ CAN_user_borrowers_edit_borrowers number_of_adult_categories destination Sticky Cookies */ >+/* global borrowernumber advsearch dateformat __ CAN_user_borrowers_delete_borrowers CAN_user_borrowers_edit_borrowers number_of_adult_categories destination Sticky Cookies*/ > > $(document).ready(function(){ > >@@ -26,10 +26,12 @@ $(document).ready(function(){ > searchfield_date_tooltip('_filter'); > }); > >- if( CAN_user_borrowers_edit_borrowers ){ >+ if( CAN_user_borrowers_delete_borrowers ){ > $("#deletepatron").click(function(){ > window.location='/cgi-bin/koha/members/deletemem.pl?member=' + borrowernumber; > }); >+ } >+ if( CAN_user_borrowers_edit_borrowers ){ > $("#renewpatron").click(function(){ > confirm_reregistration(); > $(".btn-group").removeClass("open"); >diff --git a/members/deletemem.pl b/members/deletemem.pl >index 492e00e581..2a12728548 100755 >--- a/members/deletemem.pl >+++ b/members/deletemem.pl >@@ -38,13 +38,14 @@ use Koha::Patron::Categories; > > my $input = CGI->new; > >-my ($template, $loggedinuser, $cookie) >- = get_template_and_user({template_name => "members/deletemem.tt", >- query => $input, >- type => "intranet", >- flagsrequired => {borrowers => 'edit_borrowers'}, >- debug => 1, >- }); >+my ( $template, $loggedinuser, $cookie ) = get_template_and_user( >+ { template_name => "members/deletemem.tt", >+ query => $input, >+ type => "intranet", >+ flagsrequired => { borrowers => 'delete_borrowers' }, >+ debug => 1, >+ } >+); > > #print $input->header; > my $member = $input->param('member'); >@@ -70,7 +71,7 @@ if ($patron->category->category_type eq "S") { > exit 0; # Exit without error > } > } else { >- unless(C4::Auth::haspermission($userenv->{'id'},{'borrowers'=>'edit_borrowers'})) { >+ unless(C4::Auth::haspermission($userenv->{'id'},{'borrowers'=>'delete_borrowers'})) { > print $input->redirect("/cgi-bin/koha/members/moremember.pl?borrowernumber=$member&error=CANT_DELETE"); > exit 0; # Exit without error > } >-- >2.32.0
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 15788
:
115091
|
115092
|
118865
|
118866
|
118874
|
118875
|
121887
| 121888 |
121889
|
121890