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

(-)a/circ/curbside_pickups.pl (-1 / +1 lines)
Lines 38-44 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
38
        template_name => "circ/curbside_pickups.tt",
38
        template_name => "circ/curbside_pickups.tt",
39
        query         => $input,
39
        query         => $input,
40
        type          => "intranet",
40
        type          => "intranet",
41
        flagsrequired => { parameters => 'manage_curbside_pickups' },
41
        flagsrequired => { circulate => 'manage_curbside_pickups' },
42
    }
42
    }
43
);
43
);
44
44
(-)a/installer/data/mysql/atomicupdate/bug_30650.pl (-1 / +6 lines)
Lines 171-177 return { Link Here
171
        $dbh->do(qq{
171
        $dbh->do(qq{
172
            INSERT IGNORE permissions (module_bit, code, description)
172
            INSERT IGNORE permissions (module_bit, code, description)
173
            VALUES
173
            VALUES
174
            (3, 'manage_curbside_pickups', 'Manage curbside pickups')
174
            (1, 'manage_curbside_pickups', 'Manage curbside pickups (circulation)')
175
        });
176
        $dbh->do(qq{
177
            INSERT IGNORE permissions (module_bit, code, description)
178
            VALUES
179
            (3, 'manage_curbside_pickups', 'Manage curbside pickups (admin)')
175
        });
180
        });
176
181
177
        unless ( column_exists('curbside_pickup_policy', 'enable_waiting_holds_only') ) {
182
        unless ( column_exists('curbside_pickup_policy', 'enable_waiting_holds_only') ) {
(-)a/installer/data/mysql/mandatory/userpermissions.sql (+1 lines)
Lines 5-10 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
5
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
5
   ( 1, 'force_checkout', 'Force checkout if a limitation exists'),
6
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
6
   ( 1, 'manage_restrictions', 'Manage restrictions for accounts'),
7
   ( 1, 'manage_checkout_notes', 'Mark checkout notes as seen/not seen'),
7
   ( 1, 'manage_checkout_notes', 'Mark checkout notes as seen/not seen'),
8
   ( 1, 'manage_curbside_pickups', 'Manage curbside pickups'),
8
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
9
   ( 3, 'parameters_remaining_permissions', 'Remaining system parameters permissions'),
9
   ( 3, 'manage_accounts', 'Manage Account Debit and Credit Types' ),
10
   ( 3, 'manage_accounts', 'Manage Account Debit and Credit Types' ),
10
   ( 3, 'manage_circ_rules', 'Manage circulation rules'),
11
   ( 3, 'manage_circ_rules', 'Manage circulation rules'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation-home.tt (-2 / +1 lines)
Lines 83-89 Link Here
83
                    <li>
83
                    <li>
84
                        <a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar"></i> Holds awaiting pickup</a>
84
                        <a class="circ-button" href="/cgi-bin/koha/circ/waitingreserves.pl"><i class="fa fa-calendar"></i> Holds awaiting pickup</a>
85
                    </li>
85
                    </li>
86
                    [% IF ( Koha.Preference('CurbsidePickup') && CAN_user_parameters_manage_curbside_pickups ) %]
86
                    [% IF ( Koha.Preference('CurbsidePickup') && CAN_user_circulate_manage_curbside_pickups ) %]
87
                    <li>
87
                    <li>
88
                        <a class="circ-button" href="/cgi-bin/koha/circ/curbside_pickups.pl"><i class="fa fa-refresh"></i> Curbside Pickups</a>
88
                        <a class="circ-button" href="/cgi-bin/koha/circ/curbside_pickups.pl"><i class="fa fa-refresh"></i> Curbside Pickups</a>
89
                    </li>
89
                    </li>
90
- 

Return to bug 30650