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

Sponsored-by: CLAMS
Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: David Cook <dcook@prosentient.com.au>
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>

installer/data/mysql/atomicupdate/Bug_35830_add_merge_borrowers_permission.pl

@@ -0,0 +1,24 @@
+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'";
+
+        $dbh->do(
+            q{INSERT INTO user_permissions (borrowernumber, module_bit, code) SELECT  borrowernumber, module_bit, 'merge_borrowers' FROM user_permissions where module_bit = 4 and code = 'edit_borrowers';}
+        );
+
+        say $out "Added 'merge_borrowers' permission to existing users with 'edit_borrowers'";
+    },
+};

installer/data/mysql/mandatory/userpermissions.sql

@@ -49,6 +49,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'),

koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc

@@ -228,6 +228,9 @@
     [%- CASE 'delete_borrowers' -%]
         <span class="sub_permission delete_borrowers_subpermission"> Delete patrons </span>
         <span class="permissioncode">([% name | html %])</span>
+    [%- CASE 'merge_borrowers' -%]
+        <span class="sub_permission merge_borrowers_subpermission"> Merge patrons </span>
+        <span class="permissioncode">([% name | html %])</span>
     [%- CASE 'edit_borrowers' -%]
         <span class="sub_permission edit_borrowers_subpermission"> Add, modify and view patron information </span>
         <span class="permissioncode">([% name | html %])</span>

koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt

@@ -95,7 +95,7 @@
                                     </div>
                                 [% END %]
 
-                                [% IF CAN_user_borrowers_edit_borrowers %]
+                                [% IF CAN_user_borrowers_merge_borrowers %]
                                     <div class="btn-group">
                                         <button id="merge-patrons" class="btn btn-default btn-sm disabled" disabled="disabled" type="submit"><i class="fa fa-compress" aria-hidden="true"></i> Merge selected patrons</button>
                                     </div>

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' },
     }
 );
 

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,