Bugzilla – Attachment 174376 Details for
Bug 34355
Automated MARC record ordering process
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 34355: (QA follow-up) Permissions fixes
Bug-34355-QA-follow-up-Permissions-fixes.patch (text/plain), 3.66 KB, created by
Matt Blenkinsop
on 2024-11-11 15:24:43 UTC
(
hide
)
Description:
Bug 34355: (QA follow-up) Permissions fixes
Filename:
MIME Type:
Creator:
Matt Blenkinsop
Created:
2024-11-11 15:24:43 UTC
Size:
3.66 KB
patch
obsolete
>From 9367e163649ed3942776352cc2dde8c5120deb5b Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >Date: Wed, 30 Oct 2024 11:35:54 +0000 >Subject: [PATCH] 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> >--- > Koha/ImportBatch.pm | 2 +- > api/v1/swagger/paths/acquisitions_vendors.yaml | 4 +++- > koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt | 2 +- > .../prog/en/modules/admin/marc_order_accounts.tt | 6 +++++- > 4 files changed, 10 insertions(+), 4 deletions(-) > >diff --git a/Koha/ImportBatch.pm b/Koha/ImportBatch.pm >index 994ff8b564f..3f63df6e564 100644 >--- a/Koha/ImportBatch.pm >+++ b/Koha/ImportBatch.pm >@@ -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) { >diff --git a/api/v1/swagger/paths/acquisitions_vendors.yaml b/api/v1/swagger/paths/acquisitions_vendors.yaml >index ed817cc2a1d..4c2d3ba971a 100644 >--- a/api/v1/swagger/paths/acquisitions_vendors.yaml >+++ b/api/v1/swagger/paths/acquisitions_vendors.yaml >@@ -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 >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >index 49fa3df4c81..71df7e12e0f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/admin-home.tt >@@ -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 ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt >index 2a9b8675779..b9c9dc5fd8f 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_order_accounts.tt >@@ -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 %] >-- >2.39.3 (Apple Git-146)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 34355
:
154705
|
154706
|
154707
|
154708
|
154709
|
154710
|
157092
|
157093
|
157094
|
157095
|
157096
|
157097
|
157098
|
157099
|
157100
|
160858
|
160859
|
160860
|
160861
|
160862
|
160863
|
160864
|
160865
|
160866
|
160867
|
160868
|
160869
|
160870
|
160871
|
160872
|
160873
|
160874
|
160875
|
169896
|
169897
|
169898
|
169899
|
169900
|
169901
|
169902
|
169903
|
169904
|
170395
|
170401
|
170402
|
170403
|
170404
|
170405
|
170406
|
170407
|
170408
|
170409
|
173054
|
173055
|
173056
|
173057
|
173058
|
173059
|
173060
|
173061
|
173062
|
173063
|
173064
|
173065
|
173066
|
173709
|
173805
|
173806
|
173809
|
173824
|
173825
|
173993
|
173994
|
173995
|
173996
|
173997
|
173998
|
173999
|
174000
|
174001
|
174002
|
174003
|
174004
|
174005
|
174006
|
174007
|
174008
|
174009
|
174010
|
174362
|
174363
|
174364
|
174365
|
174366
|
174367
|
174368
|
174369
|
174370
|
174371
|
174372
|
174373
|
174374
|
174375
| 174376 |
174377
|
174378
|
174379
|
174380
|
174382
|
174383