Bugzilla – Attachment 181811 Details for
Bug 38010
Migrate vendors to Vue
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 38010: (QA follow-up) Move syspref values to config endpoint
Bug-38010-QA-follow-up-Move-syspref-values-to-conf.patch (text/plain), 5.57 KB, created by
Jonathan Druart
on 2025-04-30 21:05:49 UTC
(
hide
)
Description:
Bug 38010: (QA follow-up) Move syspref values to config endpoint
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2025-04-30 21:05:49 UTC
Size:
5.57 KB
patch
obsolete
>From 5f79daf14702872b92ac20192aeb1d02434039c6 Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@openfifth.co.uk> >Date: Wed, 30 Apr 2025 14:09:51 +0100 >Subject: [PATCH] Bug 38010: (QA follow-up) Move syspref values to config > endpoint > >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > Koha/REST/V1/Acquisitions/Vendors.pm | 9 +++++++++ > acqui/vendors.pl | 16 ---------------- > api/v1/swagger/definitions/vendors_config.yaml | 12 ++++++++++++ > .../prog/en/modules/acqui/vendors.tt | 8 +------- > .../prog/js/vue/components/Vendors/Main.vue | 8 ++++---- > 5 files changed, 26 insertions(+), 27 deletions(-) > >diff --git a/Koha/REST/V1/Acquisitions/Vendors.pm b/Koha/REST/V1/Acquisitions/Vendors.pm >index 564a5dbdd95..b508ec36625 100644 >--- a/Koha/REST/V1/Acquisitions/Vendors.pm >+++ b/Koha/REST/V1/Acquisitions/Vendors.pm >@@ -20,6 +20,9 @@ use Modern::Perl; > use Mojo::Base 'Mojolicious::Controller'; > > use Koha::Acquisition::Booksellers; >+use Koha::Acquisition::Currencies; >+ >+use C4::Context; > > use Try::Tiny qw( catch try ); > >@@ -182,10 +185,16 @@ sub config { > my $userflags = C4::Auth::getuserflags( $patron->flags, $patron->id ); > my $permissions = Koha::Auth::Permissions->get_authz_from_flags( { flags => $userflags } ); > >+ my @gst_values = map { option => $_ + 0.0 }, split( '\|', C4::Context->preference("TaxRates") ); >+ > return $c->render( > status => 200, > openapi => { > permissions => $permissions, >+ currencies => Koha::Acquisition::Currencies->search->unblessed, >+ gst_values => \@gst_values, >+ edifact => C4::Context->preference('EDIFACT'), >+ marc_orders => C4::Context->preference('MarcOrderingAutomation'), > }, > ); > } >diff --git a/acqui/vendors.pl b/acqui/vendors.pl >index fdf77a6f2a4..79d2c337b10 100755 >--- a/acqui/vendors.pl >+++ b/acqui/vendors.pl >@@ -36,20 +36,4 @@ my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user( > } > ); > >-my $user_permissions = {}; >-my $var_data = $template->{VARS}; >-foreach my $key ( keys %{$var_data} ) { >- $user_permissions->{$key} = $var_data->{$key} if ( $key =~ /CAN_user_(.*)/ ); >-} >- >-my @gst_values = map { option => $_ + 0.0 }, split( '\|', C4::Context->preference("TaxRates") ); >- >-$template->param( >- user_permissions => $user_permissions, >- currencies => Koha::Acquisition::Currencies->search->unblessed, >- gst_values => \@gst_values, >- edifact => C4::Context->preference('EDIFACT'), >- marc_orders => C4::Context->preference('MarcOrderingAutomation'), >-); >- > output_html_with_http_headers $query, $cookie, $template->output; >diff --git a/api/v1/swagger/definitions/vendors_config.yaml b/api/v1/swagger/definitions/vendors_config.yaml >index f9e71160cd1..7c52ced670d 100644 >--- a/api/v1/swagger/definitions/vendors_config.yaml >+++ b/api/v1/swagger/definitions/vendors_config.yaml >@@ -4,4 +4,16 @@ properties: > permissions: > type: object > description: List of permissions for the user >+ currencies: >+ type: array >+ description: List of currencies >+ gst_values: >+ type: array >+ description: List of GST values >+ edifact: >+ type: boolean >+ description: EDIFACT syspref value >+ marc_orders: >+ type: boolean >+ description: MarcOrderingAutomation syspref value > additionalProperties: false >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt >index f0db6268e9b..822f5940b1c 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/vendors.tt >@@ -30,13 +30,7 @@ > [% INCLUDE 'js-patron-format.inc' %] > [% INCLUDE 'js-date-format.inc' %] > [% INCLUDE 'format_price.inc' %] >- <script> >- const userPermissions = [% To.json(user_permissions) | $raw %]; >- const currencies = [% To.json(currencies) | $raw %]; >- const gstValues = [% To.json(gst_values) | $raw %]; >- const edifact = [% To.json(edifact) | $raw %]; >- const marcOrderAutomation = [% To.json(marc_orders) | $raw %]; >- </script> >+ > [% Asset.js("js/vue/dist/acquisitions.js") | $raw %] > [% INCLUDE 'select2.inc' %] > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue >index 907c17ae85c..b41b27f46f4 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/Main.vue >@@ -65,11 +65,11 @@ export default { > const client = APIClient.acquisition; > client.config.get("vendors").then(config => { > this.userPermissions = config.permissions; >- this.config.settings.edifact = edifact; >+ this.config.settings.edifact = config.edifact; > this.config.settings.marcOrderAutomation = >- marcOrderAutomation; >- this.vendorStore.currencies = currencies; >- this.vendorStore.gstValues = gstValues.map(gv => { >+ config.marcOrderAutomation; >+ this.vendorStore.currencies = config.currencies; >+ this.vendorStore.gstValues = config.gst_values.map(gv => { > return { > label: `${Number(gv.option * 100).format_price()}%`, > value: gv.option, >-- >2.34.1
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 38010
:
174119
|
174120
|
174121
|
174122
|
174123
|
174124
|
174125
|
174126
|
174128
|
174129
|
174130
|
174131
|
174132
|
174133
|
174134
|
174135
|
174136
|
174137
|
174138
|
174139
|
174140
|
174141
|
174142
|
174143
|
174144
|
174145
|
174146
|
174147
|
174148
|
174151
|
174152
|
174153
|
174154
|
174155
|
174156
|
174157
|
174158
|
174159
|
174160
|
174161
|
174162
|
174163
|
174164
|
174165
|
174166
|
174167
|
174168
|
174169
|
174170
|
174171
|
174172
|
174173
|
174174
|
174175
|
174176
|
174177
|
174178
|
174179
|
174194
|
174196
|
174197
|
174198
|
174199
|
174200
|
174201
|
174202
|
174203
|
174204
|
174205
|
174206
|
174207
|
174208
|
174209
|
174210
|
174211
|
174212
|
174213
|
174214
|
174215
|
174216
|
174217
|
174218
|
174220
|
174221
|
174222
|
174223
|
174224
|
174225
|
174226
|
174248
|
174266
|
174267
|
174269
|
174270
|
174273
|
174327
|
174328
|
174329
|
174330
|
174331
|
174332
|
174333
|
174334
|
174335
|
174336
|
174337
|
174338
|
174339
|
174340
|
174341
|
174342
|
174343
|
174344
|
174345
|
174346
|
174347
|
174348
|
174349
|
174350
|
174351
|
174352
|
174353
|
174354
|
174355
|
174356
|
174357
|
174358
|
174359
|
174360
|
174603
|
175098
|
175099
|
175100
|
175101
|
175102
|
175103
|
175104
|
175105
|
175106
|
175107
|
175108
|
175109
|
175110
|
175111
|
175112
|
175113
|
175114
|
175115
|
175116
|
175117
|
175118
|
175119
|
175120
|
175121
|
175122
|
175123
|
175124
|
175125
|
175126
|
175127
|
175128
|
175129
|
175130
|
175131
|
175133
|
175134
|
175135
|
175136
|
175137
|
175167
|
175168
|
175170
|
175240
|
175241
|
175242
|
175243
|
175248
|
175249
|
175266
|
175791
|
175799
|
176547
|
178182
|
178183
|
178184
|
178185
|
178186
|
178187
|
178188
|
178189
|
178190
|
178191
|
178192
|
178193
|
178194
|
178195
|
178196
|
178197
|
178198
|
178199
|
178200
|
178201
|
178202
|
178203
|
178204
|
178205
|
178206
|
178207
|
178208
|
178209
|
178210
|
178211
|
178212
|
178213
|
178214
|
178215
|
178216
|
178217
|
178218
|
178219
|
178220
|
178221
|
178222
|
178223
|
178224
|
178225
|
178226
|
178227
|
178228
|
178229
|
178230
|
178231
|
178232
|
178233
|
178234
|
178235
|
178236
|
178237
|
178238
|
178239
|
178240
|
178241
|
178242
|
181579
|
181585
|
181727
|
181728
|
181729
|
181730
|
181731
|
181732
|
181733
|
181734
|
181735
|
181736
|
181737
|
181738
|
181739
|
181740
|
181741
|
181742
|
181743
|
181744
|
181745
|
181746
|
181747
|
181748
|
181749
|
181750
|
181751
|
181752
|
181753
|
181754
|
181755
|
181756
|
181757
|
181758
|
181759
|
181760
|
181761
|
181762
|
181763
|
181764
|
181765
|
181766
|
181767
|
181768
|
181769
|
181770
|
181771
|
181772
|
181773
|
181774
|
181775
|
181776
|
181777
|
181778
|
181779
|
181780
|
181781
|
181782
|
181783
|
181784
|
181785
|
181786
|
181787
|
181788
|
181789
|
181790
|
181791
|
181792
|
181793
|
181794
|
181795
|
181796
|
181797
|
181798
|
181799
|
181800
|
181801
|
181802
|
181803
|
181804
|
181805
|
181806
|
181807
|
181808
|
181809
|
181810
| 181811 |
181812
|
181813
|
181814
|
181815
|
181816
|
181817
|
181818
|
181819
|
181820
|
181821
|
181891
|
181898
|
181901
|
181963
|
181964
|
182053
|
182351
|
182438