@@ -, +, @@
---
.../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(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
+++ a/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 %]
Delete
[% ELSE %]
Delete
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/str/members-menu.inc
+++ a/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 %]";
--- a/koha-tmpl/intranet-tmpl/prog/js/members-menu.js
+++ a/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");
--- a/members/deletemem.pl
+++ a/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
}
--