From 5effa1f0ae1bd7baa8f4d8e75771c48dea42ef4a Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Wed, 22 Mar 2023 09:51:27 -0300 Subject: [PATCH] Bug 32932: Update router to use name property for eholdings As per previous commit for agreements Signed-off-by: Agustin Moyano --- .../ERM/EHoldingsEBSCOPackageAgreements.vue | 7 +++- .../ERM/EHoldingsEBSCOPackageTitlesList.vue | 16 ++++++---- .../ERM/EHoldingsEBSCOPackagesList.vue | 32 +++++++++++-------- .../ERM/EHoldingsEBSCOPackagesShow.vue | 2 +- .../ERM/EHoldingsEBSCOResourcesShow.vue | 10 ++++-- .../ERM/EHoldingsEBSCOTitlePackagesList.vue | 16 ++++++---- .../ERM/EHoldingsEBSCOTitlesList.vue | 23 ++++++------- .../ERM/EHoldingsEBSCOTitlesShow.vue | 2 +- .../ERM/EHoldingsLocalPackageTitlesList.vue | 16 ++++++---- .../ERM/EHoldingsLocalPackagesFormAdd.vue | 14 ++++---- .../ERM/EHoldingsLocalPackagesList.vue | 23 +++++++------ .../ERM/EHoldingsLocalPackagesShow.vue | 22 +++++++++---- .../ERM/EHoldingsLocalPackagesToolbar.vue | 2 +- .../ERM/EHoldingsLocalResourcesShow.vue | 10 ++++-- .../ERM/EHoldingsLocalTitlePackagesList.vue | 16 ++++++---- .../ERM/EHoldingsLocalTitlesFormAdd.vue | 14 ++++---- .../ERM/EHoldingsLocalTitlesList.vue | 23 +++++++------ .../ERM/EHoldingsLocalTitlesShow.vue | 13 +++++--- .../ERM/EHoldingsLocalTitlesToolbar.vue | 4 +-- .../js/vue/components/ERM/LicensesShow.vue | 2 +- 20 files changed, 164 insertions(+), 103 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageAgreements.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageAgreements.vue index 734db3e594..a98f4940d2 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageAgreements.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageAgreements.vue @@ -17,7 +17,12 @@ v-bind:key="counter" > {{ package_agreement.agreement.name }}   diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue index 99b3060086..ff34537ec7 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackageTitlesList.vue @@ -92,9 +92,10 @@ export default { }, methods: { show_resource: function (resource_id) { - this.$router.push( - "/cgi-bin/koha/erm/eholdings/ebsco/resources/" + resource_id - ) + this.$router.push({ + name: "EHoldingsEBSCOResourcesShow", + params: { resource_id }, + }) }, filter_table: function () { $("#" + this.table_id) @@ -111,6 +112,7 @@ export default { let map_av_dt_filter = this.map_av_dt_filter let filters = this.filters let table_id = this.table_id + let router = this.$router window["av_title_publication_types"] = map_av_dt_filter( "av_title_publication_types" @@ -179,13 +181,15 @@ export default { let tr = $(this).parent() let row = api.row(tr).data() if (!row) return // Happen if the table is empty + let { href } = router.resolve({ + name: "EHoldingsEBSCOResourcesShow", + params: { resource_id: row.resource_id }, + }) let n = createVNode( "a", { role: "button", - href: - "/cgi-bin/koha/erm/eholdings/ebsco/resources/" + - row.resource_id, + href, onClick: e => { e.preventDefault() show_resource(row.resource_id) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue index 6dd3f40fe9..b6395cc416 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesList.vue @@ -107,10 +107,10 @@ export default { }, computed: { local_packages_url() { - return build_url( - "/cgi-bin/koha/erm/eholdings/local/packages", - this.filters - ) + let { href } = this.$router.resolve({ + name: "EHoldingsLocalPackagesList", + }) + return build_url(href, this.filters) }, }, beforeRouteEnter(to, from, next) { @@ -120,15 +120,16 @@ export default { }, methods: { show_package: function (package_id) { - this.$router.push( - "/cgi-bin/koha/erm/eholdings/ebsco/packages/" + package_id - ) + this.$router.push({ + name: "EHoldingsEBSCOPackagesShow", + params: { package_id }, + }) }, filter_table: async function () { - let new_route = build_url( - "/cgi-bin/koha/erm/eholdings/ebsco/packages", - this.filters - ) + let { href } = this.$router.resolve({ + name: "EHoldingsEBSCOPackagesShow", + }) + let new_route = build_url(href, this.filters) this.$router.push(new_route) this.show_table = true this.local_count_packages = null @@ -157,6 +158,7 @@ export default { let show_package = this.show_package let get_lib_from_av = this.get_lib_from_av let map_av_dt_filter = this.map_av_dt_filter + let router = this.$router if (!this.show_table) { this.show_table = build_url_params(this.filters).length @@ -262,13 +264,15 @@ export default { let tr = $(this).parent() let row = api.row(tr).data() if (!row) return // Happen if the table is empty + let { href } = router.resolve({ + name: "EHoldingsEBSCOPackagesShow", + params: { package_id: row.package_id }, + }) let n = createVNode( "a", { role: "button", - href: - "/cgi-bin/koha/erm/eholdings/ebsco/packages/" + - row.package_id, + href, onClick: e => { e.preventDefault() show_package(row.package_id) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue index a90b0d1523..b0a1c888d9 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOPackagesShow.vue @@ -102,7 +102,7 @@
{{ $__("Close") }}{{ $__("Publication title") }}: {{ resource.title.publication_title }}{{ $__("Package") }}: {{ resource.package.name }} diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlePackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlePackagesList.vue index 7b599667e7..8d7ee1e8c2 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlePackagesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlePackagesList.vue @@ -66,9 +66,10 @@ export default { }, methods: { show_resource: function (resource_id) { - this.$router.push( - "/cgi-bin/koha/erm/eholdings/ebsco/resources/" + resource_id - ) + this.$router.push({ + name: "EHoldingsEBSCOResourcesShow", + params: { resource_id }, + }) }, toggle_filters: function (e) { this.display_filters = !this.display_filters @@ -83,6 +84,7 @@ export default { let resources = this.resources let filters = this.filters let table_id = this.table_id + let router = this.$router $.fn.dataTable.ext.search = $.fn.dataTable.ext.search.filter( search => search.name != "apply_filter" @@ -122,13 +124,15 @@ export default { let tr = $(this).parent() let row = api.row(tr).data() if (!row) return // Happen if the table is empty + let { href } = router.resolve({ + name: "EHoldingsEBSCOResourcesShow", + params: { resource_id: row.resource_id }, + }) let n = createVNode( "a", { role: "button", - href: - "/cgi-bin/koha/erm/eholdings/ebsco/resources/" + - row.resource_id, + href, onClick: e => { e.preventDefault() show_resource(row.resource_id) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue index bbd6d54e8c..a3d840fb6a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesList.vue @@ -109,10 +109,10 @@ export default { }, computed: { local_titles_url() { - return build_url( - "/cgi-bin/koha/erm/eholdings/local/titles", - this.filters - ) + let { href } = this.$router.resolve({ + name: "EHoldingsLocalTitlesList", + }) + return build_url(href, this.filters) }, }, beforeRouteEnter(to, from, next) { @@ -122,17 +122,18 @@ export default { }, methods: { show_title: function (title_id) { - this.$router.push( - "/cgi-bin/koha/erm/eholdings/ebsco/titles/" + title_id - ) + this.$router.push({ + name: "EHoldingsEBSCOTitlesShow", + params: { title_id }, + }) }, filter_table: async function () { if (this.filters.publication_title.length) { this.cannot_search = false - let new_route = build_url( - "/cgi-bin/koha/erm/eholdings/ebsco/titles", - this.filters - ) + let { href } = this.$router.resolve({ + name: "EHoldingsEBSCOTitlesList", + }) + let new_route = build_url(href, this.filters) this.$router.push(new_route) this.show_table = true this.local_title_count = null diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue index 8ea3ef6fde..53b6d2b5e2 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOTitlesShow.vue @@ -232,7 +232,7 @@
{{ $__("Close") }} { e.preventDefault() show_resource(row.resource_id) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue index 268af004b2..8e58e09d10 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormAdd.vue @@ -73,7 +73,7 @@
{{ $__("Cancel") }} { setMessage(this.$__("Package updated")) - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/packages" - ) + this.$router.push({ + name: "EHoldingsLocalPackagesList", + }) }, error => {} ) @@ -194,9 +194,9 @@ export default { client.localPackages.create(erm_package).then( success => { setMessage(this.$__("Package created")) - 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/EHoldingsLocalPackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue index 9fd12f7323..9c6d72d2d0 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesList.vue @@ -73,14 +73,16 @@ export default { ) }, show_package: function (package_id) { - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/packages/" + package_id - ) + this.$router.push({ + name: "EHoldingsLocalPackagesShow", + params: { package_id }, + }) }, edit_package: function (package_id) { - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/packages/edit/" + package_id - ) + this.$router.push({ + name: "EHoldingsLocalPackagesFormAddEdit", + params: { package_id }, + }) }, delete_package: function (package_id, package_name) { this.setConfirmationDialog( @@ -118,6 +120,7 @@ export default { let show_package = this.show_package let edit_package = this.edit_package let delete_package = this.delete_package + let router = this.$router let get_lib_from_av = this.get_lib_from_av let map_av_dt_filter = this.map_av_dt_filter let filters = this.filters @@ -290,13 +293,15 @@ export default { let tr = $(this).parent() let row = api.row(tr).data() if (!row) return // Happen if the table is empty + let { href } = router.resolve({ + name: "EHoldingsLocalPackagesShow", + params: { package_id: row.package_id }, + }) let n = createVNode( "a", { role: "button", - href: - "/cgi-bin/koha/erm/eholdings/local/packages/" + - row.package_id, + href, onClick: e => { e.preventDefault() show_package(row.package_id) 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 918205b6f1..19a73c36f6 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 @@ -5,7 +5,10 @@ {{ $__("Package #%s").format(erm_package.package_id) }} @@ -69,7 +72,14 @@ :key="package_agreement.agreement_id" > {{ package_agreement.agreement.name }}
{{ $__("Close") }} {} ) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesToolbar.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesToolbar.vue index 6b31743d05..49610bd891 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesToolbar.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesToolbar.vue @@ -1,7 +1,7 @@