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

Bug 34355: (QA follow-up) Permissions fixes 

This patch addresses some permissions errors and updates the breadcrumbs to reflect this

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-30 11:35:54 +00:00 committed by Katrin Fischer
parent af22e7fad7
commit 738700b49a
No known key found for this signature in database
GPG Key ID: 0EF6E2C03357A834
4 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Koha/ImportBatch.pm
View File

@ -121,7 +121,7 @@ sub new_from_file {
if ( $num_valid && $job ) {
$job->set( { progress => $num_valid, size => $num_valid } );
} else { # We must assume that something went wrong here
$job->set( { progress => 0, status => 'failed' } );
$job->set( { progress => 0, status => 'failed' } ) if $job;
}
if ($profile_id) {

4
api/v1/swagger/paths/acquisitions_vendors.yaml
View File

@ -75,7 +75,9 @@
$ref: "../swagger.yaml#/definitions/error"
x-koha-authorization:
permissions:
acquisition: vendors_manage
acquisition:
- vendors_manage
- marc_order_manage
post:
x-mojo-to: Acquisitions::Vendors#add
operationId: addVendor

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

@ -225,7 +225,7 @@
</dl>
[% 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 ) ) %]
<h3>Acquisition parameters</h3>
<dl>
[% IF ( CAN_user_acquisition_currencies_manage ) %]

6
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt
View File

@ -17,7 +17,11 @@ MARC Order Accounts
[% WRAPPER 'sub-header.inc' %]
[% WRAPPER breadcrumbs %]
[% WRAPPER breadcrumb_item %]
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
[% IF CAN_user_parameters %]
<a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
[% ELSE %]
<a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a>
[% END %]
[% END %]
[% IF acct_form || delete_confirm %]