diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue index d491250a8b..e551a94532 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue @@ -159,7 +159,7 @@
{{ $__("Cancel") }} { setMessage(this.$__("Agreement updated")) - this.$router.push("/cgi-bin/koha/erm/agreements") + this.$router.push({ name: "AgreementsList" }) }, error => {} ) @@ -383,7 +383,7 @@ export default { client.agreements.create(agreement).then( success => { setMessage(this.$__("Agreement created")) - 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/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue index 7d8df42c1a..54414fd050 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue @@ -165,16 +165,18 @@ export default { error => {} ) }, - doShow: function (agreement, dt, event) { + doShow: function ({ agreement_id }, dt, event) { event.preventDefault() - this.$router.push( - "/cgi-bin/koha/erm/agreements/" + agreement.agreement_id - ) + this.$router.push({ + name: "AgreementsShow", + params: { agreement_id }, + }) }, - doEdit: function (agreement, dt, event) { - this.$router.push( - "/cgi-bin/koha/erm/agreements/edit/" + agreement.agreement_id - ) + doEdit: function ({ agreement_id }, dt, event) { + this.$router.push({ + name: "AgreementsFormAddEdit", + params: { agreement_id }, + }) }, doDelete: function (agreement, dt, event) { this.setConfirmationDialog( @@ -228,10 +230,8 @@ export default { if (!this.filters.by_expired) { this.filters.max_expiration_date = "" } - let new_route = build_url( - "/cgi-bin/koha/erm/agreements", - this.filters - ) + let { href } = this.$router.resolve({ name: "AgreementsList" }) + let new_route = build_url(href, this.filters) this.$router.push(new_route) } this.$refs.table.redraw(this.table_url()) 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 81d49a4158..34e77e98b8 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 @@ -5,7 +5,10 @@ {{ $__("Agreement #%s").format(agreement.agreement_id) }} @@ -161,7 +164,13 @@ > {{ agreement_license.license.name }} @@ -198,7 +207,15 @@ > {{ relationship.related_agreement.name }} {{ agreement_package.package.name }} {{ agreement_package.package.name }}
{{ $__("Close") }} {} ) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue index 035c326683..b61ceec2fc 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue @@ -1,8 +1,6 @@