From cb856af65beb0748a270e45374bd65afea3cfb4f Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 1 Oct 2024 11:20:33 +0000 Subject: [PATCH] Bug 38010: Rebase for Button component change Bug 38010: Fix rspack error in VendorShow Signed-off-by: Michaela Sieber Signed-off-by: Jonathan Druart --- .../prog/js/vue/components/Vendors/VendorDetails.vue | 1 + .../prog/js/vue/components/Vendors/VendorInterfaces.vue | 1 + .../prog/js/vue/components/Vendors/VendorList.vue | 6 +++--- .../prog/js/vue/components/Vendors/VendorShow.vue | 6 +++--- 4 files changed, 8 insertions(+), 6 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 fd583a2d8e0..9183d6ee7ca 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 @@ -51,6 +51,7 @@ }" class="" :title="vendor.url" + callback="redirect" />
  • 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 20545f6b5f3..b094ec87e04 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 @@ -19,6 +19,7 @@ }" class="" :title="vi.uri" + callback="redirect" />
  • 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 a9c7d712b0a..8b2022c5131 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 @@ -2,7 +2,7 @@
    {{ $__("Loading") }}
    - import flatPickr from "vue-flatpickr-component"; import Toolbar from "../Toolbar.vue"; -import ToolbarButton from "../ToolbarButton.vue"; +import ButtonLink from "../ButtonLink.vue"; import { inject, ref } from "vue"; import { APIClient } from "../../fetch/api-client.js"; import { storeToRefs } from "pinia"; @@ -248,7 +248,7 @@ export default { ]; }, }, - components: { flatPickr, Toolbar, ToolbarButton, KohaTable }, + components: { flatPickr, Toolbar, ButtonLink, KohaTable }, name: "VendorList", emits: ["select-vendor", "close"], }; 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 61732bd16b4..cbd3d182604 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 @@ -2,12 +2,12 @@
    {{ $__("Loading") }}
    - -

    @@ -53,7 +54,6 @@