@@ -, +, @@ agreements --- .../vue/components/ERM/AgreementsFormAdd.vue | 6 +-- .../js/vue/components/ERM/AgreementsList.vue | 24 +++++----- .../js/vue/components/ERM/AgreementsShow.vue | 45 ++++++++++++++++--- .../vue/components/ERM/AgreementsToolbar.vue | 4 +- .../ERM/EHoldingsEBSCOPackageAgreements.vue | 7 ++- .../ERM/EHoldingsEBSCOPackageTitlesList.vue | 10 ++--- .../ERM/EHoldingsEBSCOPackagesList.vue | 26 +++++------ .../ERM/EHoldingsEBSCOPackagesShow.vue | 2 +- .../ERM/EHoldingsEBSCOResourcesShow.vue | 10 ++++- .../ERM/EHoldingsEBSCOTitlePackagesList.vue | 16 ++++--- .../ERM/EHoldingsEBSCOTitlesList.vue | 25 ++++++----- .../ERM/EHoldingsEBSCOTitlesShow.vue | 2 +- .../ERM/EHoldingsLocalPackageTitlesList.vue | 10 ++--- .../ERM/EHoldingsLocalPackagesFormAdd.vue | 14 +++--- .../ERM/EHoldingsLocalPackagesList.vue | 20 ++++----- .../ERM/EHoldingsLocalPackagesShow.vue | 22 ++++++--- .../ERM/EHoldingsLocalPackagesToolbar.vue | 2 +- .../ERM/EHoldingsLocalResourcesShow.vue | 10 ++++- .../ERM/EHoldingsLocalTitlePackagesList.vue | 16 ++++--- .../ERM/EHoldingsLocalTitlesFormAdd.vue | 14 +++--- .../ERM/EHoldingsLocalTitlesList.vue | 19 ++++---- .../ERM/EHoldingsLocalTitlesShow.vue | 13 +++--- .../ERM/EHoldingsLocalTitlesToolbar.vue | 4 +- .../js/vue/components/ERM/LicensesFormAdd.vue | 6 +-- .../js/vue/components/ERM/LicensesList.vue | 15 +++---- .../js/vue/components/ERM/LicensesShow.vue | 9 ++-- .../js/vue/components/ERM/LicensesToolbar.vue | 2 +- .../prog/js/vue/components/ERM/Main.vue | 4 +- .../intranet-tmpl/prog/js/vue/routes/erm.js | 24 ++++++++++ 29 files changed, 238 insertions(+), 143 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue +++ a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsFormAdd.vue @@ -167,7 +167,7 @@
{{ $__("Cancel") }} { setMessage(this.$__("Agreement updated")) - this.$router.push("/cgi-bin/koha/erm/agreements") + this.$router.push({ name: "AgreementsList" }) }, error => {} ) @@ -391,7 +391,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 => {} ) --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue +++ a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue @@ -164,16 +164,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( @@ -215,10 +217,8 @@ export default { }, filter_table: async function () { if (!this.embedded) { - 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) } if (this.filters.by_expired) { --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue +++ a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsShow.vue @@ -5,7 +5,10 @@ {{ $__("Agreement #%s").format(agreement.agreement_id) }} @@ -159,7 +162,13 @@ > {{ agreement_license.license.name }} @@ -196,7 +205,15 @@ > {{ relationship.related_agreement.name }} {{ agreement_package.package.name }} {{ agreement_package.package.name }}
{{ $__("Close") }} {} ) --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue +++ a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsToolbar.vue @@ -1,8 +1,6 @@