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

(-)a/installer/data/mysql/atomicupdate/bug_10190.pl (+6 lines)
Lines 13-18 return { Link Here
13
            exit;
13
            exit;
14
        }
14
        }
15
15
16
        # Remove the tools sub-permission for notice triggers; access is now
17
        # controlled by parameters/manage_circ_rules instead.
18
        # user_permissions rows are cleaned up automatically via ON DELETE CASCADE.
19
        $dbh->do(q|DELETE FROM permissions WHERE code = 'edit_notice_status_triggers'|);
20
        say_success( $out, "Removed deprecated permission 'edit_notice_status_triggers'" );
21
16
        # Populate empty overduerules table for missing categories
22
        # Populate empty overduerules table for missing categories
17
        $dbh->do(
23
        $dbh->do(
18
            q|
24
            q|
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (-3 lines)
Lines 401-409 Link Here
401
    [%- CASE 'edit_additional_contents' -%]
401
    [%- CASE 'edit_additional_contents' -%]
402
        <span class="sub_permission edit_additional_contents_subpermission"> Write additional contents for the OPAC and staff interfaces (news and HTML customizations) </span>
402
        <span class="sub_permission edit_additional_contents_subpermission"> Write additional contents for the OPAC and staff interfaces (news and HTML customizations) </span>
403
        <span class="permissioncode">([% name | html %])</span>
403
        <span class="permissioncode">([% name | html %])</span>
404
    [%- CASE 'edit_notice_status_triggers' -%]
405
        <span class="sub_permission edit_notice_status_triggers_subpermission"> Set notice/status triggers for overdue items </span>
406
        <span class="permissioncode">([% name | html %])</span>
407
    [%- CASE 'edit_notices' -%]
404
    [%- CASE 'edit_notices' -%]
408
        <span class="sub_permission edit_notices_subpermission"> Define notices </span>
405
        <span class="sub_permission edit_notices_subpermission"> Define notices </span>
409
        <span class="permissioncode">([% name | html %])</span>
406
        <span class="permissioncode">([% name | html %])</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc (-4 / +1 lines)
Lines 6-12 Link Here
6
    <ul>
6
    <ul>
7
        <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></li>
7
        <li><a href="/cgi-bin/koha/tools/tools-home.pl">Tools home</a></li>
8
    </ul>
8
    </ul>
9
    [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons  || CAN_user_tools_edit_patrons || CAN_user_tools_batch_extend_due_dates || CAN_user_tools_batch_modify_holds || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) || CAN_user_tools_rotating_collections ) %]
9
    [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons  || CAN_user_tools_edit_notices || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons  || CAN_user_tools_edit_patrons || CAN_user_tools_batch_extend_due_dates || CAN_user_tools_batch_modify_holds || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) || CAN_user_tools_rotating_collections ) %]
10
        <h5>Patrons and circulation</h5>
10
        <h5>Patrons and circulation</h5>
11
        <ul>
11
        <ul>
12
            [% IF ( CAN_user_tools_manage_patron_lists ) %]
12
            [% IF ( CAN_user_tools_manage_patron_lists ) %]
Lines 24-32 Link Here
24
            [% IF ( CAN_user_tools_edit_notices ) %]
24
            [% IF ( CAN_user_tools_edit_notices ) %]
25
                <li><a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a></li>
25
                <li><a href="/cgi-bin/koha/tools/letter.pl">Notices and slips</a></li>
26
            [% END %]
26
            [% END %]
27
            [% IF ( CAN_user_tools_edit_notice_status_triggers ) %]
28
                <li><a href="/cgi-bin/koha/admin/circulation_triggers">Overdue notice/status triggers</a></li>
29
            [% END %]
30
            [% IF ( CAN_user_tools_label_creator ) %]
27
            [% IF ( CAN_user_tools_label_creator ) %]
31
                <li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a></li>
28
                <li><a href="/cgi-bin/koha/patroncards/home.pl">Patron card creator</a></li>
32
            [% END %]
29
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt (-1 / +1 lines)
Lines 29-35 Link Here
29
    <h1>Tools</h1>
29
    <h1>Tools</h1>
30
    <div class="row">
30
    <div class="row">
31
        <div class="col-sm-6">
31
        <div class="col-sm-6">
32
            [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons  || CAN_user_tools_edit_patrons || CAN_user_tools_batch_extend_due_dates || ( CAN_user_tools_batch_modify_holds && CAN_user_reserveforothers_place_holds ) || CAN_user_tools_moderate_tags || CAN_user_tools_rotating_collections || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %]
32
            [% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons  || CAN_user_tools_edit_notices || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons  || CAN_user_tools_edit_patrons || CAN_user_tools_batch_extend_due_dates || ( CAN_user_tools_batch_modify_holds && CAN_user_reserveforothers_place_holds ) || CAN_user_tools_moderate_tags || CAN_user_tools_rotating_collections || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %]
33
                <h3>Patrons and circulation</h3>
33
                <h3>Patrons and circulation</h3>
34
            [% END %]
34
            [% END %]
35
            <dl>
35
            <dl>
(-)a/t/Koha/Auth/Permissions.t (-2 lines)
Lines 267-273 subtest 'superlibrarian tests' => sub { Link Here
267
        'CAN_user_tools_delete_anonymize_patrons'                   => 1,
267
        'CAN_user_tools_delete_anonymize_patrons'                   => 1,
268
        'CAN_user_tools_edit_additional_contents'                   => 1,
268
        'CAN_user_tools_edit_additional_contents'                   => 1,
269
        'CAN_user_tools_edit_calendar'                              => 1,
269
        'CAN_user_tools_edit_calendar'                              => 1,
270
        'CAN_user_tools_edit_notice_status_triggers'                => 1,
271
        'CAN_user_tools_edit_notices'                               => 1,
270
        'CAN_user_tools_edit_notices'                               => 1,
272
        'CAN_user_tools_edit_patrons'                               => 1,
271
        'CAN_user_tools_edit_patrons'                               => 1,
273
        'CAN_user_tools_edit_quotes'                                => 1,
272
        'CAN_user_tools_edit_quotes'                                => 1,
274
- 

Return to bug 10190