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

(-)a/catalogue/stockrotation.pl (-1 / +1 lines)
Lines 59-65 my ($template, $loggedinuser, $cookie) = get_template_and_user( Link Here
59
        authnotrequired => 0,
59
        authnotrequired => 0,
60
        flagsrequired   => {
60
        flagsrequired   => {
61
            catalogue => 1,
61
            catalogue => 1,
62
            stockrotation => 'can_add_items_rotas',
62
            stockrotation => 'manage_rota_items',
63
        },
63
        },
64
    }
64
    }
65
);
65
);
(-)a/installer/data/mysql/atomicupdate/stockrot_tables.sql (-2 / +2 lines)
Lines 60-67 INSERT IGNORE INTO userflags (bit, flag, flagdesc, defaulton) VALUES Link Here
60
       (23, 'stockrotation', 'Manage stockrotation operations', 0);
60
       (23, 'stockrotation', 'Manage stockrotation operations', 0);
61
61
62
INSERT IGNORE INTO permissions (module_bit, code, description) VALUES
62
INSERT IGNORE INTO permissions (module_bit, code, description) VALUES
63
       (23, 'can_edit_rotas', 'Create, edit and delete rotas'),
63
       (23, 'manage_rotas', 'Create, edit and delete rotas'),
64
       (23, 'can_add_items_rotas', 'Add and remove items from rotas');
64
       (23, 'manage_rota_items', 'Add and remove items from rotas');
65
65
66
-- Notices
66
-- Notices
67
67
(-)a/installer/data/mysql/userpermissions.sql (-2 / +2 lines)
Lines 86-91 INSERT INTO permissions (module_bit, code, description) VALUES Link Here
86
   (21, 'enroll', 'Enroll patrons in clubs'),
86
   (21, 'enroll', 'Enroll patrons in clubs'),
87
   (23, 'self_checkin_module', 'Log into the self check-in module'),
87
   (23, 'self_checkin_module', 'Log into the self check-in module'),
88
   (23, 'self_checkout_module', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID')
88
   (23, 'self_checkout_module', 'Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID')
89
   (24, 'can_edit_rotas', 'Create, edit and delete rotas'),
89
   (24, 'manage_rotas', 'Create, edit and delete rotas'),
90
   (24, 'can_add_items_rotas', 'Add and remove items from rotas')
90
   (24, 'manage_rota_items', 'Add and remove items from rotas')
91
;
91
;
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/biblio-view-menu.inc (-1 / +1 lines)
Lines 40-46 Link Here
40
[% IF ( issuehistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]
40
[% IF ( issuehistoryview ) %]<li class="active">[% ELSE %]<li>[% END %]
41
<a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio_object_id | url  %]" >Checkout history</a></li>
41
<a href="/cgi-bin/koha/catalogue/issuehistory.pl?biblionumber=[% biblio_object_id | url  %]" >Checkout history</a></li>
42
[% IF ( CAN_user_tools_view_system_logs ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=CATALOGUING&amp;action=MODIFY&amp;object=[% biblio_object_id | url  %]">Modification log</a> </li>[% END %]
42
[% IF ( CAN_user_tools_view_system_logs ) %][% IF ( logview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=CATALOGUING&amp;action=MODIFY&amp;object=[% biblio_object_id | url  %]">Modification log</a> </li>[% END %]
43
[% IF ( CAN_user_stockrotation_can_add_items_rotas && Koha.Preference('StockRotation') ) %][% IF ( stockrotationview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/catalogue/stockrotation.pl?biblionumber=[% biblio_object_id %]">Rota</a> </li>[% END %]
43
[% IF ( CAN_user_stockrotation_manage_rota_items && Koha.Preference('StockRotation') ) %][% IF ( stockrotationview ) %]<li class="active">[% ELSE %]<li>[% END %]<a href="/cgi-bin/koha/catalogue/stockrotation.pl?biblionumber=[% biblio_object_id %]">Rota</a> </li>[% END %]
44
</ul>
44
</ul>
45
</div>
45
</div>
46
46
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc (-2 / +2 lines)
Lines 115-121 Link Here
115
  [%# self_check %]
115
  [%# self_check %]
116
    [%- CASE 'self_checkin_module' -%]<span>Log into the self check-in module. Note: this permission prevents the patron from using any other OPAC functionality</span>
116
    [%- CASE 'self_checkin_module' -%]<span>Log into the self check-in module. Note: this permission prevents the patron from using any other OPAC functionality</span>
117
    [%- CASE 'self_checkout_module' -%]<span>Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID</span>
117
    [%- CASE 'self_checkout_module' -%]<span>Perform self checkout at the OPAC. It should be used for the patron matching the AutoSelfCheckID</span>
118
    [%- CASE 'can_add_items_rotas' -%]<span>Add and remove items from rotas</span>
118
    [%- CASE 'manage_rota_items' -%]<span>Add and remove items from rotas</span>
119
    [%- CASE 'can_edit_rotas' -%]<span>Create, edit and delete rotas</span>
119
    [%- CASE 'manage_rotas' -%]<span>Create, edit and delete rotas</span>
120
  [%- END -%]
120
  [%- END -%]
121
[%- END -%]
121
[%- END -%]
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc (-1 / +1 lines)
Lines 40-46 Link Here
40
    [% IF ( CAN_user_tools_batch_upload_patron_images ) %]
40
    [% IF ( CAN_user_tools_batch_upload_patron_images ) %]
41
	<li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li>
41
	<li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li>
42
    [% END %]
42
    [% END %]
43
    [% IF ( CAN_user_stockrotation_can_edit_rotas && Koha.Preference('StockRotation') ) %]
43
    [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %]
44
    <li><a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a></li>
44
    <li><a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a></li>
45
    [% END %]
45
    [% END %]
46
</ul>
46
</ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stockrotation.tt (-1 / +1 lines)
Lines 97-103 Link Here
97
                                                </button>
97
                                                </button>
98
                                                <ul class="dropdown-menu">
98
                                                <ul class="dropdown-menu">
99
                                                    <li><a href="?op=manage_stages&amp;rota_id=[% rota.rota_id %]">Stages</a></li>
99
                                                    <li><a href="?op=manage_stages&amp;rota_id=[% rota.rota_id %]">Stages</a></li>
100
                                                    [% IF CAN_user_stockrotation_can_add_items_rotas && rota.stockrotationstages.count > 0 %]
100
                                                    [% IF CAN_user_stockrotation_manage_rota_items && rota.stockrotationstages.count > 0 %]
101
                                                    <li><a href="?op=manage_items&amp;rota_id=[% rota.rota_id %]">Items</a></li>
101
                                                    <li><a href="?op=manage_items&amp;rota_id=[% rota.rota_id %]">Items</a></li>
102
                                                    [% END %]
102
                                                    [% END %]
103
                                                </ul>
103
                                                </ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt (-2 / +1 lines)
Lines 72-78 Link Here
72
	<dd>Upload patron images in a batch or one at a time</dd>
72
	<dd>Upload patron images in a batch or one at a time</dd>
73
    [% END %]
73
    [% END %]
74
74
75
    [% IF ( CAN_user_stockrotation_can_edit_rotas && Koha.Preference('StockRotation') ) %]
75
    [% IF ( CAN_user_stockrotation_manage_rotas && Koha.Preference('StockRotation') ) %]
76
    <dt><a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a></dt>
76
    <dt><a href="/cgi-bin/koha/tools/stockrotation.pl">Stock rotation</a></dt>
77
    <dd>Manage Stock rotation rotas, rota stages and rota items</dd>
77
    <dd>Manage Stock rotation rotas, rota stages and rota items</dd>
78
    [% END %]
78
    [% END %]
79
- 

Return to bug 11897