From 3b0e96b6e4f36167d33313008685f7219ee94b5a Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 14 Feb 2023 14:02:40 +0000 Subject: [PATCH] Bug 32932: Update router to use name property for licences As per previous commit for agreements --- .../prog/js/vue/components/ERM/LicensesFormAdd.vue | 6 +++--- .../js/vue/components/ERM/LicensesFormConfirmDelete.vue | 4 ++-- .../prog/js/vue/components/ERM/LicensesList.vue | 6 +++--- .../prog/js/vue/components/ERM/LicensesShow.vue | 6 +++--- .../prog/js/vue/components/ERM/LicensesToolbar.vue | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue index b5034591e24..0510249f3a7 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormAdd.vue @@ -133,7 +133,7 @@
{{ $__("Cancel") }} { if (response.status == 200) { - this.$router.push("/cgi-bin/koha/erm/licenses") + this.$router.push({ name: 'LicensesList' }) setMessage(this.$__("License updated")) } else if (response.status == 201) { - this.$router.push("/cgi-bin/koha/erm/licenses") + this.$router.push({ name: 'LicensesList' }) setMessage(this.$__("License created")) } else { setError(response.message || response.statusText) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormConfirmDelete.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormConfirmDelete.vue index 1de737b10a6..c853809a3d3 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormConfirmDelete.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesFormConfirmDelete.vue @@ -23,7 +23,7 @@ :value="$__('Yes, delete')" /> {{ $__("No, do not delete") }} { if (response.status == 204) { - this.$router.push("/cgi-bin/koha/erm/licenses") + this.$router.push({ name: 'LicensesList' }) setMessage(this.$__("License deleted")) } else { setError(response.message || response.statusText) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue index c8d80b3d223..584ee94eb9d 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue @@ -54,13 +54,13 @@ export default { this.initialized = true }, show_license: function (license_id) { - this.$router.push("/cgi-bin/koha/erm/licenses/" + license_id) + this.$router.push({ name: 'LicensesShow', params: { license_id } }) }, edit_license: function (license_id) { - this.$router.push("/cgi-bin/koha/erm/licenses/edit/" + license_id) + this.$router.push({ name: 'LicensesFormAddEdit', params: { license_id } }) }, delete_license: function (license_id) { - this.$router.push("/cgi-bin/koha/erm/licenses/delete/" + license_id) + this.$router.push({ name: 'LicensesFormConfirmDelete', params: { license_id } }) }, build_datatable: function () { let show_license = this.show_license diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue index 358dd52b38a..7ddcf0c2fa2 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue @@ -5,12 +5,12 @@ {{ $__("License #%s").format(license.license_id) }} @@ -133,7 +133,7 @@
{{ $__("Close") }}
- {{ $__("New license") }} -- 2.34.1