From 7098ae1ecb4f5551ccc9e17c7b8ea2827c2bb65f Mon Sep 17 00:00:00 2001 From: Brendan Lawlor Date: Tue, 9 Sep 2025 13:56:15 +0000 Subject: [PATCH] Bug 35830: Add merge_borrowers subpermission Merging patrons only required edit_borrowers permission but would result in a patron deletion. This patch requires a new merge_borrowers subpermission To test: 1. Give a patron the following permissions catalogue, edit_borrowers, list_borrowers 2. Log into the staff interface as the patron 3. Do a patron search and select 2 patrons 4. Click merge patron - success - a patron got deleted 5. Apply patch, updatedatabase and restart_all 6. Repeat steps 3 and 4 - you can't 7. Add the new permission for merge_borrowers 8. Repeat steps 3 and 4 - now you can 9. prove t/Koha/Auth/Patrons.t --- ...Bug_35830_add_merge_borrowers_permission.pl | 18 ++++++++++++++++++ .../data/mysql/mandatory/userpermissions.sql | 1 + .../prog/en/includes/permissions.inc | 3 +++ .../prog/en/modules/members/member.tt | 2 +- members/merge-patrons.pl | 2 +- t/Koha/Auth/Permissions.t | 1 + 6 files changed, 25 insertions(+), 2 deletions(-) create mode 100755 installer/data/mysql/atomicupdate/Bug_35830_add_merge_borrowers_permission.pl diff --git a/installer/data/mysql/atomicupdate/Bug_35830_add_merge_borrowers_permission.pl b/installer/data/mysql/atomicupdate/Bug_35830_add_merge_borrowers_permission.pl new file mode 100755 index 0000000000..3b2d4e36a2 --- /dev/null +++ b/installer/data/mysql/atomicupdate/Bug_35830_add_merge_borrowers_permission.pl @@ -0,0 +1,18 @@ +use Modern::Perl; +use Koha::Installer::Output qw(say_warning say_success say_info); + +return { + bug_number => "35830", + description => "Add permission borrowers:merge_borrowers", + up => sub { + my ($args) = @_; + my ( $dbh, $out ) = @$args{qw(dbh out)}; + + $dbh->do( + q{INSERT IGNORE INTO permissions (module_bit, code, description) + VALUES (4, 'merge_borrowers', 'Merge patrons')} + ); + + say $out "Added new permission 'merge_borrowers'"; + }, +}; diff --git a/installer/data/mysql/mandatory/userpermissions.sql b/installer/data/mysql/mandatory/userpermissions.sql index 5c79972766..2bf9ba6e68 100644 --- a/installer/data/mysql/mandatory/userpermissions.sql +++ b/installer/data/mysql/mandatory/userpermissions.sql @@ -48,6 +48,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES ( 4, 'delete_borrowers', 'Delete patrons'), ( 4, 'edit_borrowers', 'Add, modify and view patron information'), ( 4, 'list_borrowers', 'Search, list and view patrons'), + ( 4, 'merge_borrowers', 'Merge patrons'), ( 4, 'send_messages_to_borrowers', 'Send messages to patrons'), ( 4, 'view_borrower_infos_from_any_libraries', 'View patron infos from any libraries'), ( 6, 'place_holds', 'Place holds for patrons'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc index 7e081216f5..4f4877220b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc @@ -225,6 +225,9 @@ [%- CASE 'delete_borrowers' -%] Delete patrons ([% name | html %]) + [%- CASE 'merge_borrowers' -%] + Merge patrons + ([% name | html %]) [%- CASE 'edit_borrowers' -%] Add, modify and view patron information ([% name | html %]) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt index fb42e1d5b7..e81b6aedd2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt @@ -95,7 +95,7 @@ [% END %] - [% IF CAN_user_borrowers_edit_borrowers %] + [% IF CAN_user_borrowers_merge_borrowers %]
diff --git a/members/merge-patrons.pl b/members/merge-patrons.pl index cb10f2fcbb..c0100fa5c0 100755 --- a/members/merge-patrons.pl +++ b/members/merge-patrons.pl @@ -33,7 +33,7 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( template_name => "members/merge-patrons.tt", query => $cgi, type => "intranet", - flagsrequired => { borrowers => 'edit_borrowers' }, + flagsrequired => { borrowers => 'merge_borrowers' }, } ); diff --git a/t/Koha/Auth/Permissions.t b/t/Koha/Auth/Permissions.t index b65c3b90bb..88af7c03c4 100755 --- a/t/Koha/Auth/Permissions.t +++ b/t/Koha/Auth/Permissions.t @@ -127,6 +127,7 @@ subtest 'superlibrarian tests' => sub { 'CAN_user_acquisition' => 1, 'CAN_user_borrowers_send_messages_to_borrowers' => 1, 'CAN_user_borrowers_delete_borrowers' => 1, + 'CAN_user_borrowers_merge_borrowers' => 1, 'CAN_user_borrowers_edit_borrowers' => 1, 'CAN_user_borrowers_list_borrowers' => 1, 'CAN_user_borrowers_api_validate_password' => 1, -- 2.39.5