From dfb92660ad7cf16d491d38ad8ec4efcf47d2cb0f Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Wed, 22 Mar 2023 09:28:08 -0300 Subject: [PATCH] Bug 32932: Update router to use name property for licences As per previous commit for agreements Signed-off-by: Agustin Moyano --- .../prog/js/vue/components/ERM/LicensesFormAdd.vue | 6 +++--- .../prog/js/vue/components/ERM/LicensesList.vue | 7 +++++-- .../prog/js/vue/components/ERM/LicensesShow.vue | 9 ++++++--- .../prog/js/vue/components/ERM/LicensesToolbar.vue | 2 +- 4 files changed, 15 insertions(+), 9 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 272253cadf..d93ee9c51c 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 @@ -135,7 +135,7 @@
{{ $__("Cancel") }} { setMessage(this.$__("License updated")) - this.$router.push("/cgi-bin/koha/erm/licenses") + this.$router.push({ name: "LicensesList" }) }, error => {} ) @@ -274,7 +274,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/LicensesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue index b42355685c..a8ae7781b8 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 @@ -63,10 +63,13 @@ 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, license_name) { this.setConfirmationDialog( 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 64c1349cf2..5abe50fcce 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,7 +5,10 @@ {{ $__("License #%s").format(license.license_id) }} @@ -131,7 +134,7 @@
{{ $__("Close") }} {} ) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesToolbar.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesToolbar.vue index 510fbff57e..829ed5a47a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesToolbar.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesToolbar.vue @@ -1,6 +1,6 @@