From 45a4a459470f76544417a45cb0429a6dd73690ec 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 +++--- .../vue/components/ERM/LicensesFormConfirmDelete.vue | 4 ++-- .../prog/js/vue/components/ERM/LicensesList.vue | 12 +++++++++--- .../prog/js/vue/components/ERM/LicensesShow.vue | 12 +++++++++--- .../prog/js/vue/components/ERM/LicensesToolbar.vue | 2 +- 5 files changed, 24 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 004d77dd4f0..5edac7bde9a 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") }} { setMessage(this.$__("License updated")) - this.$router.push("/cgi-bin/koha/erm/licenses") + this.$router.push({ name: "LicensesList" }) }, error => {} ) @@ -272,7 +272,7 @@ export default { client.licenses.create(license).then( success => { setMessage(this.$__("License created")) - this.$router.push("/cgi-bin/koha/erm/licenses") + this.$router.push({ name: "LicensesList" }) }, error => {} ) 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 0bf3dbfefa1..69ecfb6012f 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") }} { setMessage(this.$__("License deleted")) - this.$router.push("/cgi-bin/koha/erm/licenses") + this.$router.push({ name: "LicensesList" }) }, error => {} ) 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 84eb25bf441..b2c9b5b07ae 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 @@ -59,13 +59,19 @@ export default { ) }, 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 bf77b9f613e..d9c9bbd6d91 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,18 @@ {{ $__("License #%s").format(license.license_id) }} @@ -133,7 +139,7 @@
{{ $__("Close") }}
- {{ $__("New license") }} -- 2.37.1 (Apple Git-137.1)