Bugzilla – Attachment 178231 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) Fix new vendor form
Bug-38010-QA-follow-up-Fix-new-vendor-form.patch (text/plain), 5.52 KB, created by
Matt Blenkinsop
on 2025-02-18 13:49:39 UTC
(
hide
)
Description:
Bug 38010: (QA follow-up) Fix new vendor form
Filename:
MIME Type:
Creator:
Matt Blenkinsop
Created:
2025-02-18 13:49:39 UTC
Size:
5.52 KB
patch
obsolete
>From 7ac0d390386b0960a19110f13ea9b0c106da1547 Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >Date: Wed, 15 Jan 2025 15:10:42 +0000 >Subject: [PATCH] Bug 38010: (QA follow-up) Fix new vendor form > >--- > .../vue/components/Vendors/VendorDetails.vue | 6 ++++- > .../vue/components/Vendors/VendorFormAdd.vue | 27 ++++++++++++++----- > .../components/Vendors/VendorInterfaces.vue | 8 +++--- > .../Vendors/VendorOrderingInformation.vue | 6 +++-- > 4 files changed, 34 insertions(+), 13 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue >index 6d6f8df17db..70409fb389a 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorDetails.vue >@@ -195,11 +195,15 @@ export default { > if (!this.vendor.aliases) { > this.vendor.aliases = []; > } >+ if (!this.newAlias) return; > this.vendor.aliases.push({ alias: this.newAlias }); > this.newAlias = ""; > }, > removeAlias(e) { >- this.vendor.aliases.splice(this.vendor.aliases.indexOf(e.alias), 1); >+ const aliasIndex = this.vendor.aliases >+ .map(e => e.alias) >+ .indexOf(e.alias); >+ this.vendor.aliases.splice(aliasIndex, 1); > }, > }, > components: { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue >index 2405a70ebde..7f31ea051d7 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorFormAdd.vue >@@ -114,13 +114,17 @@ export default { > delete vendor.physical; > delete vendor.subscriptions_count; > >- vendor.contacts = vendor.contacts.map( >- ({ id, booksellerid, ...requiredProperties }) => >- requiredProperties >+ vendor.contacts = this.checkContactOrInterface( >+ vendor.contacts.map( >+ ({ id, booksellerid, ...requiredProperties }) => >+ requiredProperties >+ ) > ); >- vendor.interfaces = vendor.interfaces.map( >- ({ interface_id, vendor_id, ...requiredProperties }) => >- requiredProperties >+ vendor.interfaces = this.checkContactOrInterface( >+ vendor.interfaces.map( >+ ({ interface_id, vendor_id, ...requiredProperties }) => >+ requiredProperties >+ ) > ); > > const client = APIClient.acquisition; >@@ -142,6 +146,17 @@ export default { > ); > } > }, >+ checkContactOrInterface(array) { >+ return array.reduce((acc, curr) => { >+ const atLeastOneFieldFilled = Object.keys(curr).some( >+ key => curr[key] >+ ); >+ if (atLeastOneFieldFilled) { >+ acc.push(curr); >+ } >+ return acc; >+ }, []); >+ }, > }, > components: { > ButtonSubmit, >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue >index b094ec87e04..e2a1ed1281d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorInterfaces.vue >@@ -58,10 +58,6 @@ > > > <legend> > {{ $__("Interface details") }} >- <a href="#" @click.prevent="deleteInterface(i)" >- ><i class="fa fa-trash"></i> >- {{ $__("Remove this interface") }}</a >- > > </legend> > <ol> > <li> >@@ -131,6 +127,10 @@ > /> > </li> > </ol> >+ <span class="btn btn-default" @click.prevent="deleteContact(i)" >+ ><font-awesome-icon icon="trash" /> >+ {{ $__("Delete interface") }}</span >+ > > </fieldset> > <span class="btn btn-default" @click="addInterface" > ><font-awesome-icon icon="plus" /> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue >index d24b353e6a4..abec175f5e0 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorOrderingInformation.vue >@@ -186,7 +186,8 @@ > <li> > <label for="discount">{{ $__("Discount") }}: </label> > <input >- type="number" >+ type="text" >+ inputmode="numeric" > size="6" > id="discount" > name="discount" >@@ -197,7 +198,8 @@ > <li> > <label for="deliverytime">{{ $__("Delivery time") }}: </label> > <input >- type="number" >+ type="text" >+ inputmode="numeric" > size="6" > id="deliverytime" > name="deliverytime" >-- >2.48.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