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

(-)a/installer/data/mysql/atomicupdate/bug11911_suggestions_permission.sql (+6 lines)
Line 0 Link Here
1
INSERT INTO permissions (module_bit, code, description) VALUES (11, 'suggestions_manage', 'Manage purchase suggestions');
2
3
INSERT INTO user_permissions (borrowernumber, module_bit, code)
4
  SELECT borrowernumber, 11, 'suggestions_manage' FROM borrowers WHERE flags & (1 << 2);
5
6
-- Bug 19911: Add new permission suggestions_manage and update staff users
(-)a/installer/data/mysql/userpermissions.sql (+1 lines)
Lines 17-22 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
17
   ( 9, 'delete_all_items', 'Delete all items at once'),
17
   ( 9, 'delete_all_items', 'Delete all items at once'),
18
   (10, 'writeoff', 'Write off fines and fees'),
18
   (10, 'writeoff', 'Write off fines and fees'),
19
   (10, 'remaining_permissions', 'Remaining permissions for managing fines and fees'),
19
   (10, 'remaining_permissions', 'Remaining permissions for managing fines and fees'),
20
   (11, 'suggestions_manage', 'Manage purchase suggestions'),
20
   (11, 'vendors_manage', 'Manage vendors'),
21
   (11, 'vendors_manage', 'Manage vendors'),
21
   (11, 'contracts_manage', 'Manage contracts'),
22
   (11, 'contracts_manage', 'Manage contracts'),
22
   (11, 'period_manage', 'Manage periods'),
23
   (11, 'period_manage', 'Manage periods'),
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc (-3 / +3 lines)
Lines 3-11 Link Here
3
        <h5>Acquisitions</h5>
3
        <h5>Acquisitions</h5>
4
        <ul>
4
        <ul>
5
            <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions home</a></li>
5
            <li><a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions home</a></li>
6
            <li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>
6
            [% IF ( CAN_user_acquisition_order_receive ) %]<li><a href="/cgi-bin/koha/acqui/lateorders.pl">Late orders</a></li>[% END %]
7
            [% IF ( suggestion ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]
7
            [% IF ( suggestion && CAN_user_acquisition_suggestions_manage ) %]<li><a href="/cgi-bin/koha/suggestion/suggestion.pl">Suggestions</a></li>[% END %]
8
                <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
8
            <li><a href="/cgi-bin/koha/acqui/invoices.pl">Invoices</a></li>
9
            [% IF CAN_user_acquisition_edi_manage %]
9
            [% IF CAN_user_acquisition_edi_manage %]
10
                <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
10
                <li><a href="/cgi-bin/koha/acqui/edifactmsgs.pl">EDIFACT messages</a></li>
11
            [% END %]
11
            [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/circ-menu.inc (-1 / +1 lines)
Lines 109-115 Link Here
109
        [% END %]
109
        [% END %]
110
    [% END %]
110
    [% END %]
111
111
112
    [% IF CAN_user_borrowers_edit_borrowers %]
112
    [% IF CAN_user_acquisition_suggestions_manage %]
113
        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber %]">Purchase suggestions</a></li>
113
        [% IF ( suggestionsview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/members/purchase-suggestions.pl?borrowernumber=[% patron.borrowernumber %]">Purchase suggestions</a></li>
114
    [% END %]
114
    [% END %]
115
    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
115
    [% IF CAN_user_borrowers_edit_borrowers && useDischarge %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (+1 lines)
Lines 45-50 Link Here
45
    [%- CASE 'fast_cataloging' -%]<span>Fast cataloging</span>
45
    [%- CASE 'fast_cataloging' -%]<span>Fast cataloging</span>
46
    [%- CASE 'remaining_permissions' -%]<span>Remaining permissions for managing fines and fees</span>
46
    [%- CASE 'remaining_permissions' -%]<span>Remaining permissions for managing fines and fees</span>
47
    [%- CASE 'writeoff' -%]<span>Write off fines and fees</span>
47
    [%- CASE 'writeoff' -%]<span>Write off fines and fees</span>
48
    [%- CASE 'suggestions_manage' -%]<span>Manage purchase suggestions</span>
48
    [%- CASE 'budget_add_del' -%]<span>Add and delete budgets (but can't modify budgets)</span>
49
    [%- CASE 'budget_add_del' -%]<span>Add and delete budgets (but can't modify budgets)</span>
49
    [%- CASE 'budget_manage' -%]<span>Manage budgets</span>
50
    [%- CASE 'budget_manage' -%]<span>Manage budgets</span>
50
    [%- CASE 'budget_manage_all' -%]<span>Manage all budgets</span>
51
    [%- CASE 'budget_manage_all' -%]<span>Manage all budgets</span>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-1 / +1 lines)
Lines 135-141 Link Here
135
                                </div>
135
                                </div>
136
                                [% END %]
136
                                [% END %]
137
137
138
                                [% IF ( CAN_user_acquisition && pendingsuggestions ) %]
138
                                [% IF ( CAN_user_acquisition_suggestions_manage && pendingsuggestions ) %]
139
                                <div class="pending-info" id="suggestions_pending">
139
                                <div class="pending-info" id="suggestions_pending">
140
140
141
                                    <a href="/cgi-bin/koha/suggestion/suggestion.pl#ASKED">Suggestions pending approval</a>:
141
                                    <a href="/cgi-bin/koha/suggestion/suggestion.pl#ASKED">Suggestions pending approval</a>:
(-)a/members/purchase-suggestions.pl (-1 / +1 lines)
Lines 35-41 my ( $template, $loggedinuser, $cookie ) = get_template_and_user( Link Here
35
        query           => $input,
35
        query           => $input,
36
        type            => "intranet",
36
        type            => "intranet",
37
        authnotrequired => 0,
37
        authnotrequired => 0,
38
        flagsrequired   => { borrowers => 'edit_borrowers' },
38
        flagsrequired   => { acquisition => 'suggestions_manage' },
39
        debug           => 1,
39
        debug           => 1,
40
    }
40
    }
41
);
41
);
(-)a/suggestion/suggestion.pl (-2 / +1 lines)
Lines 111-117 my ( $template, $borrowernumber, $cookie, $userflags ) = get_template_and_user( Link Here
111
            template_name   => "suggestion/suggestion.tt",
111
            template_name   => "suggestion/suggestion.tt",
112
            query           => $input,
112
            query           => $input,
113
            type            => "intranet",
113
            type            => "intranet",
114
            flagsrequired   => { catalogue => 1 },
114
            flagsrequired   => { acquisition => 'suggestions_manage' },
115
        }
115
        }
116
    );
116
    );
117
117
118
- 

Return to bug 11911