gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 34355: (QA follow-up) Add permission marc_order_manage to govern control of account creation 

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
This commit is contained in:
Matt Blenkinsop 2024-10-21 09:51:42 +00:00 committed by Katrin Fischer
parent f516bff8ae
commit 28e32ee1a4
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
8 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
admin/marc_order_accounts.pl
View File

@ -44,6 +44,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
template_name => "admin/marc_order_accounts.tt",
query => $input,
type => "intranet",
flagsrequired => { acquisition => 'marc_order_manage' },
}
);

8
installer/data/mysql/atomicupdate/bug_34355-add_marc_order_accounts.pl
View File

@ -43,5 +43,13 @@ return {
}
);
$dbh->do(
q{
INSERT IGNORE INTO permissions (module_bit, code, description) values (11, 'marc_order_manage', 'Manage MARC ordering');
}
);
},
};

1
installer/data/mysql/mandatory/userpermissions.sql
View File

@ -86,6 +86,7 @@ INSERT INTO permissions (module_bit, code, description) VALUES
(11, 'budget_add_del', 'Add and delete funds (but can''t modify funds)'),
(11, 'budget_manage_all', 'Manage all funds'),
(11, 'edi_manage', 'Manage EDIFACT transmissions'),
(11, 'marc_order_manage', 'Manage MARC ordering'),
(11, 'reopen_closed_invoices', 'Reopen closed invoices'),
(11, 'edit_invoices', 'Edit invoices'),
(11, 'delete_invoices', 'Delete invoices'),

4
koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-menu.inc
View File

@ -24,7 +24,7 @@
[% END %]
</ul>
[% END %]
[% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_currencies_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) || CAN_user_parameters_manage_additional_fields ) %]
[% IF ( CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || CAN_user_acquisition_currencies_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) || CAN_user_parameters_manage_additional_fields ) || ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %]
<h5>Administration</h5>
<ul>
[% IF ( CAN_user_acquisition_period_manage ) %]
@ -40,7 +40,7 @@
<li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
<li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
[% END %]
[% IF Koha.Preference('MarcOrderingAutomation') %]
[% IF Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage %]
<li><a href="/cgi-bin/koha/admin/marc_order_accounts.pl">MARC order accounts</a></li>
[% END %]
[% IF CAN_user_acquisition_edit_invoices && CAN_user_parameters_manage_additional_fields %]

6
koha-tmpl/intranet-tmpl/prog/en/includes/admin-menu.inc
View File

@ -125,7 +125,7 @@
</ul>
[% END %]
[% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) %]
[% IF ( CAN_user_acquisition_currencies_manage || CAN_user_acquisition_period_manage || CAN_user_acquisition_budget_manage || ( Koha.Preference('EDIFACT') && CAN_user_acquisition_edi_manage ) ) || ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %]
<h5>Acquisition parameters</h5>
<ul>
[% IF ( CAN_user_acquisition_currencies_manage ) %]
@ -141,8 +141,8 @@
<li><a href="/cgi-bin/koha/admin/edi_accounts.pl">EDI accounts</a></li>
<li><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></li>
[% END %]
[% IF Koha.Preference('MarcOrderingAutomation') %]
<li><a href="/cgi-bin/koha/admin/marc_order_accounts.pl">MARC order accounts</a></li>
[% IF ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %]
<li><a href="/cgi-bin/koha/admin/edi_accounts.pl">MARC ordering accounts</a></li>
[% END %]
</ul>
[% END %]

5
koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc
View File

@ -827,6 +827,11 @@
Manage EDIFACT transmissions
</span>
<span class="permissioncode">([% name | html %])</span>
[%- CASE 'marc_order_manage' -%]
<span class="sub_permission marc_order_manage_subpermission">
Manage MARC ordering
</span>
<span class="permissioncode">([% name | html %])</span>
[%- CASE 'reopen_closed_invoices' -%]
<span class="sub_permission reopen_closed_invoices_subpermission">
Reopen closed invoices

2
koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt
View File

@ -246,7 +246,7 @@
<dt><a href="/cgi-bin/koha/admin/edi_ean_accounts.pl">Library EANs</a></dt>
<dd>Manage library EDI EANs</dd>
[% END %]
[% IF Koha.Preference('MarcOrderingAutomation') %]
[% IF ( Koha.Preference('MarcOrderingAutomation') && CAN_user_acquisition_marc_order_manage ) %]
<dt><a href="/cgi-bin/koha/admin/marc_order_accounts.pl">MARC order accounts</a></dt>
<dd>Manage vendor accounts for automated order line creation from marc records</dd>
[% END %]

1
t/Koha/Auth/Permissions.t
View File

@ -115,6 +115,7 @@ subtest 'superlibrarian tests' => sub {
'CAN_user_acquisition_group_manage' => 1,
'CAN_user_acquisition_issue_manage' => 1,
'CAN_user_acquisition_merge_invoices' => 1,
'CAN_user_acquisition_marc_order_manage' => 1,
'CAN_user_acquisition_order_manage_all' => 1,
'CAN_user_acquisition_order_manage' => 1,
'CAN_user_acquisition_order_receive' => 1,