Bugzilla – Attachment 181786 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 toolbar on VendorShow
Bug-38010-QA-follow-up-Fix-toolbar-on-VendorShow.patch (text/plain), 5.23 KB, created by
Jonathan Druart
on 2025-04-30 21:03:42 UTC
(
hide
)
Description:
Bug 38010: (QA follow-up) Fix toolbar on VendorShow
Filename:
MIME Type:
Creator:
Jonathan Druart
Created:
2025-04-30 21:03:42 UTC
Size:
5.23 KB
patch
obsolete
>From b79b1452e74043865220f6eae7d6a6886b01fbff Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >Date: Fri, 14 Feb 2025 11:41:43 +0000 >Subject: [PATCH] Bug 38010: (QA follow-up) Fix toolbar on VendorShow > >The delete button was missing from VendorShow and bug 37301 has been removed as a dependency so some small fixes were required for that > >Signed-off-by: Michaela Sieber <michaela.sieber@kit.edu> >Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >--- > .../prog/js/fetch/acquisition-api-client.js | 2 +- > .../js/vue/components/Vendors/VendorList.vue | 2 +- > .../js/vue/components/Vendors/VendorShow.vue | 46 +++++++++++++++++++ > 3 files changed, 48 insertions(+), 2 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js b/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js >index 06467777f91..6db8d0b0205 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/fetch/acquisition-api-client.js >@@ -12,7 +12,7 @@ export class AcquisitionAPIClient { > endpoint: "vendors/" + id, > headers: { > "x-koha-embed": >- "aliases,subscriptions+count,interfaces,contacts,contracts", >+ "aliases,subscriptions+count,interfaces,contacts,contracts,baskets", > }, > }), > getAll: (query, params) => >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue >index 99163403fb8..f8b2d8ff780 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorList.vue >@@ -138,7 +138,7 @@ export default { > event.preventDefault(); > this.$router.push({ > name: "VendorShow", >- params: { vendor_id: id }, >+ params: { id: id }, > }); > }, > doReceive({ id }, dt, event) { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorShow.vue >index 745331fbbe6..e0114e8b137 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorShow.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorShow.vue >@@ -36,6 +36,11 @@ > :title="$__('Edit vendor')" > /> > <ToolbarButton >+ v-if=" >+ vendor.active && >+ vendor.baskets?.length > 0 && >+ isUserPermitted('CAN_user_acquisition_order_receive') >+ " > :to="{ > path: '/cgi-bin/koha/acqui/parcels.pl', > query: { booksellerid: vendor.id }, >@@ -44,6 +49,17 @@ > :title="$__('Receive shipments')" > callback="redirect" > /> >+ <a >+ v-if=" >+ (!vendor.baskets || vendor.baskets.length === 0) && >+ (!vendor.subscriptions_count || >+ vendor.subscriptions_count === 0) && >+ (!vendor.invoices || vendor.invoices.length === 0) >+ " >+ @click="doDelete(vendor.id, vendor.name)" >+ class="btn btn-default" >+ ><font-awesome-icon icon="trash" /> {{ $__("Delete") }}</a >+ > > </Toolbar> > <h1> > {{ vendor.name }} >@@ -89,9 +105,13 @@ export default { > setup() { > const { setConfirmationDialog, setMessage } = inject("mainStore"); > >+ const permissionsStore = inject("permissionsStore"); >+ const { isUserPermitted } = permissionsStore; >+ > return { > setConfirmationDialog, > setMessage, >+ isUserPermitted, > }; > }, > data() { >@@ -116,6 +136,31 @@ export default { > error => {} > ); > }, >+ doDelete(id, name) { >+ this.setConfirmationDialog( >+ { >+ title: this.$__( >+ "Are you sure you want to remove this vendor?" >+ ), >+ message: name, >+ accept_label: this.$__("Yes, delete"), >+ cancel_label: this.$__("No, do not delete"), >+ }, >+ () => { >+ const client = APIClient.acquisition; >+ client.vendors.delete(id).then( >+ success => { >+ this.setMessage( >+ this.$__("Vendor %s deleted").format(name), >+ true >+ ); >+ this.$router.push({ name: "VendorList" }); >+ }, >+ error => {} >+ ); >+ } >+ ); >+ }, > }, > components: { > Toolbar, >@@ -127,6 +172,7 @@ export default { > VendorContacts, > VendorSubscriptions, > VendorContracts, >+ DropdownButtons, > }, > name: "VendorShow", > }; >-- >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