View | Details | Raw Unified | Return to bug 35830
Collapse All | Expand All

(-)a/installer/data/mysql/atomicupdate/Bug_35830_add_merge_borrowers_permission.pl (+18 lines)
Line 0 Link Here
1
use Modern::Perl;
2
use Koha::Installer::Output qw(say_warning say_success say_info);
3
4
return {
5
    bug_number  => "35830",
6
    description => "Add permission borrowers:merge_borrowers",
7
    up          => sub {
8
        my ($args) = @_;
9
        my ( $dbh, $out ) = @$args{qw(dbh out)};
10
11
        $dbh->do(
12
            q{INSERT IGNORE INTO permissions (module_bit, code, description)
13
            VALUES (4, 'merge_borrowers', 'Merge patrons')}
14
        );
15
16
        say $out "Added new permission 'merge_borrowers'";
17
    },
18
};
(-)a/installer/data/mysql/mandatory/userpermissions.sql (+1 lines)
Lines 48-53 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
48
   ( 4, 'delete_borrowers', 'Delete patrons'),
48
   ( 4, 'delete_borrowers', 'Delete patrons'),
49
   ( 4, 'edit_borrowers', 'Add, modify and view patron information'),
49
   ( 4, 'edit_borrowers', 'Add, modify and view patron information'),
50
   ( 4, 'list_borrowers', 'Search, list and view patrons'),
50
   ( 4, 'list_borrowers', 'Search, list and view patrons'),
51
   ( 4, 'merge_borrowers', 'Merge patrons'),   
51
   ( 4, 'send_messages_to_borrowers', 'Send messages to patrons'),
52
   ( 4, 'send_messages_to_borrowers', 'Send messages to patrons'),
52
   ( 4, 'view_borrower_infos_from_any_libraries', 'View patron infos from any libraries'),
53
   ( 4, 'view_borrower_infos_from_any_libraries', 'View patron infos from any libraries'),
53
   ( 6, 'place_holds', 'Place holds for patrons'),
54
   ( 6, 'place_holds', 'Place holds for patrons'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (+3 lines)
Lines 225-230 Link Here
225
    [%- CASE 'delete_borrowers' -%]
225
    [%- CASE 'delete_borrowers' -%]
226
        <span class="sub_permission delete_borrowers_subpermission"> Delete patrons </span>
226
        <span class="sub_permission delete_borrowers_subpermission"> Delete patrons </span>
227
        <span class="permissioncode">([% name | html %])</span>
227
        <span class="permissioncode">([% name | html %])</span>
228
    [%- CASE 'merge_borrowers' -%]
229
        <span class="sub_permission merge_borrowers_subpermission"> Merge patrons </span>
230
        <span class="permissioncode">([% name | html %])</span>
228
    [%- CASE 'edit_borrowers' -%]
231
    [%- CASE 'edit_borrowers' -%]
229
        <span class="sub_permission edit_borrowers_subpermission"> Add, modify and view patron information </span>
232
        <span class="sub_permission edit_borrowers_subpermission"> Add, modify and view patron information </span>
230
        <span class="permissioncode">([% name | html %])</span>
233
        <span class="permissioncode">([% name | html %])</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-1 / +1 lines)
Lines 95-101 Link Here
95
                                    </div>
95
                                    </div>
96
                                [% END %]
96
                                [% END %]
97
97
98
                                [% IF CAN_user_borrowers_edit_borrowers %]
98
                                [% IF CAN_user_borrowers_merge_borrowers %]
99
                                    <div class="btn-group">
99
                                    <div class="btn-group">
100
                                        <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>
100
                                        <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>
101
                                    </div>
101
                                    </div>
(-)a/members/merge-patrons.pl (-1 / +1 lines)
Lines 33-39 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here
33
        template_name => "members/merge-patrons.tt",
33
        template_name => "members/merge-patrons.tt",
34
        query         => $cgi,
34
        query         => $cgi,
35
        type          => "intranet",
35
        type          => "intranet",
36
        flagsrequired => { borrowers => 'edit_borrowers' },
36
        flagsrequired => { borrowers => 'merge_borrowers' },
37
    }
37
    }
38
);
38
);
39
39
(-)a/t/Koha/Auth/Permissions.t (-1 / +1 lines)
Lines 127-132 subtest 'superlibrarian tests' => sub { Link Here
127
        'CAN_user_acquisition'                                      => 1,
127
        'CAN_user_acquisition'                                      => 1,
128
        'CAN_user_borrowers_send_messages_to_borrowers'             => 1,
128
        'CAN_user_borrowers_send_messages_to_borrowers'             => 1,
129
        'CAN_user_borrowers_delete_borrowers'                       => 1,
129
        'CAN_user_borrowers_delete_borrowers'                       => 1,
130
        'CAN_user_borrowers_merge_borrowers'                        => 1,
130
        'CAN_user_borrowers_edit_borrowers'                         => 1,
131
        'CAN_user_borrowers_edit_borrowers'                         => 1,
131
        'CAN_user_borrowers_list_borrowers'                         => 1,
132
        'CAN_user_borrowers_list_borrowers'                         => 1,
132
        'CAN_user_borrowers_api_validate_password'                  => 1,
133
        'CAN_user_borrowers_api_validate_password'                  => 1,
133
- 

Return to bug 35830