From a3cfb7596cc67c0a5cc442c2391dc016c3db17db Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 19 Nov 2024 16:32:33 +0000 Subject: [PATCH] Bug 38010: Rebase for bug 37301 --- .../js/vue/components/Vendors/VendorList.vue | 53 +++---------------- .../vue/components/Vendors/VendorResource.vue | 29 ++++++++++ .../js/vue/components/Vendors/VendorShow.vue | 12 ++--- 3 files changed, 43 insertions(+), 51 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue 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 d14a6c50bc8..f1213eb1db6 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 @@ -3,8 +3,8 @@
@@ -12,9 +12,9 @@ @@ -33,8 +33,10 @@ import { inject, ref } from "vue" import { APIClient } from "../../fetch/api-client.js" import { storeToRefs } from "pinia" import KohaTable from "../KohaTable.vue" +import VendorResource from "./VendorResource.vue" export default { + extends: VendorResource, setup() { const vendorStore = inject("vendorStore") const { vendors } = storeToRefs(vendorStore) @@ -49,6 +51,7 @@ export default { const { isUserPermitted } = permissionsStore return { + ...VendorResource.setup(), vendors, get_lib_from_av, map_av_dt_filter, @@ -130,50 +133,10 @@ export default { error => {} ) }, - doShow({ id }, dt, event) { - event.preventDefault() - this.$router.push({ - name: "VendorShow", - params: { vendor_id: id }, - }) - }, doReceive({ id }, dt, event) { event.preventDefault() window.open(`/cgi-bin/koha/acqui/parcels.pl?booksellerid=${id}`) }, - doEdit({ id }, dt, event) { - this.$router.push({ - name: "VendorFormAddEdit", - params: { vendor_id: id }, - }) - }, - doDelete(vendor, dt, event) { - this.setConfirmationDialog( - { - title: this.$__( - "Are you sure you want to remove this vendor?" - ), - message: vendor.name, - accept_label: this.$__("Yes, delete"), - cancel_label: this.$__("No, do not delete"), - }, - () => { - const client = APIClient.acquisition - client.vendors.delete(vendor.id).then( - success => { - this.setMessage( - this.$__("Vendor %s deleted").format( - vendor.name - ), - true - ) - dt.draw() - }, - error => {} - ) - } - ) - }, doSelect(vendor, dt, event) { this.$emit("select-vendor", vendor.id) this.$emit("close") diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue new file mode 100644 index 00000000000..0a244c14d1b --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/Vendors/VendorResource.vue @@ -0,0 +1,29 @@ + 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 13ea8866aeb..2104e01e769 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 @@ -28,12 +28,8 @@ :title="$__('New')" />