From 0a1e2b2814f57699e1f29277ace283ed63c23724 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Mon, 13 Mar 2023 12:06:10 +0000 Subject: [PATCH] Bug 32932: (rebase) Rebased on top of bug 32991 This patch rebases on top of changes made in bug 32991 and also fixes an incorrect router reference in EHoldingsLocalTitlesFormAdd --- .../prog/js/vue/components/ERM/AgreementsShow.vue | 2 +- .../js/vue/components/ERM/EHoldingsLocalPackagesShow.vue | 6 +++--- .../js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue | 4 ++-- .../prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue | 6 +++--- .../prog/js/vue/components/ERM/LicensesShow.vue | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue index 35a29b58538..00bb7ec3a81 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue @@ -410,7 +410,7 @@ export default { ), true ) - this.$router.push("/cgi-bin/koha/erm/agreements") + this.$router.push({ name: "AgreementsList" }) }, error => {} ) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue index c80dba672f1..19a73c36f68 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesShow.vue @@ -190,9 +190,9 @@ export default { ), true ) - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/packages" - ) + this.$router.push({ + name: "EHoldingsLocalPackagesList", + }) }, error => {} ) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue index f83dbbe95d7..19afc5e8f92 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue @@ -503,7 +503,7 @@ export default { success => { setMessage(this.$__("Title updated")) this.$router.push({ - name: "EHoldingsLocalPackagesList", + name: "EHoldingsLocalTitlesList", }) }, error => {} @@ -513,7 +513,7 @@ export default { success => { setMessage(this.$__("Title created")) this.$router.push({ - name: "EHoldingsLocalPackagesList", + name: "EHoldingsLocalTitlesList", }) }, error => {} diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue index faad7be51b2..24fdddf81ac 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesShow.vue @@ -349,9 +349,9 @@ export default { ), true ) - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/titles" - ) + this.$router.push({ + name: "EHoldingsLocalTitlesList", + }) }, error => {} ) 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 a5ec107273d..19c853f4aa0 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 @@ -219,7 +219,7 @@ export default { ), true ) - this.$router.push("/cgi-bin/koha/erm/licenses") + this.$router.push({ name: "LicensesList" }) }, error => {} ) -- 2.37.1 (Apple Git-137.1)