From 4074ba0b17ba975b8853ca4279508b4982fa0462 Mon Sep 17 00:00:00 2001 From: Matt Blenkinsop Date: Tue, 14 Feb 2023 14:04:27 +0000 Subject: [PATCH] Bug 32932: Update router to use name property for eholdings As per previous commit for agreements --- .../ERM/EHoldingsEBSCOPackageAgreements.vue | 2 +- .../ERM/EHoldingsEBSCOPackageTitlesList.vue | 8 ++++---- .../components/ERM/EHoldingsEBSCOPackagesList.vue | 14 ++++++++------ .../components/ERM/EHoldingsEBSCOPackagesShow.vue | 2 +- .../components/ERM/EHoldingsEBSCOResourcesShow.vue | 4 ++-- .../ERM/EHoldingsEBSCOTitlePackagesList.vue | 8 ++++---- .../components/ERM/EHoldingsEBSCOTitlesList.vue | 8 +++++--- .../components/ERM/EHoldingsEBSCOTitlesShow.vue | 2 +- .../ERM/EHoldingsLocalPackageTitlesList.vue | 8 ++++---- .../ERM/EHoldingsLocalPackagesFormAdd.vue | 6 +++--- .../EHoldingsLocalPackagesFormConfirmDelete.vue | 4 ++-- .../components/ERM/EHoldingsLocalPackagesList.vue | 13 ++++++------- .../components/ERM/EHoldingsLocalPackagesShow.vue | 8 ++++---- .../ERM/EHoldingsLocalPackagesToolbar.vue | 2 +- .../components/ERM/EHoldingsLocalResourcesShow.vue | 4 ++-- .../ERM/EHoldingsLocalTitlePackagesList.vue | 8 ++++---- .../components/ERM/EHoldingsLocalTitlesFormAdd.vue | 6 +++--- .../ERM/EHoldingsLocalTitlesFormConfirmDelete.vue | 4 ++-- .../components/ERM/EHoldingsLocalTitlesList.vue | 12 ++++++------ .../components/ERM/EHoldingsLocalTitlesShow.vue | 6 +++--- .../components/ERM/EHoldingsLocalTitlesToolbar.vue | 4 ++-- 21 files changed, 68 insertions(+), 65 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 bb202c7d2cd..dfaa7b520ad 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,7 @@ 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 c4a4d669e5a..42fcb04b206 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 @@ -93,7 +93,7 @@ export default { methods: { show_resource: function (resource_id) { this.$router.push( - "/cgi-bin/koha/erm/eholdings/ebsco/resources/" + resource_id + { name: 'EHoldingsEBSCOResourcesShow', params: { resource_id }} ) }, filter_table: function () { @@ -111,6 +111,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 +180,12 @@ 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 dd4e79ae314..bde9f7dc70d 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,8 +107,9 @@ export default { }, computed: { local_packages_url() { + let { href } = this.$router.resolve({ name: 'EHoldingsLocalPackagesList'}) return build_url( - "/cgi-bin/koha/erm/eholdings/local/packages", + href, this.filters ) }, @@ -121,12 +122,13 @@ export default { methods: { show_package: function (package_id) { this.$router.push( - "/cgi-bin/koha/erm/eholdings/ebsco/packages/" + package_id + { name: 'EHoldingsEBSCOPackagesShow', params: { package_id } } ) }, filter_table: async function () { + let { href } = this.$router.resolve({ name: 'EHoldingsEBSCOPackagesShow'}) let new_route = build_url( - "/cgi-bin/koha/erm/eholdings/ebsco/packages", + href, this.filters ) this.$router.push(new_route) @@ -145,6 +147,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 @@ -250,13 +253,12 @@ 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 4951ae67630..9c72d3dac74 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 7b599667e7e..5431aadcec1 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 @@ -67,7 +67,7 @@ export default { methods: { show_resource: function (resource_id) { this.$router.push( - "/cgi-bin/koha/erm/eholdings/ebsco/resources/" + resource_id + { name: 'EHoldingsEBSCOResourcesShow', params: { resource_id }} ) }, toggle_filters: function (e) { @@ -83,6 +83,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 +123,12 @@ 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 7e807400ea3..c7cd5798f7e 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,8 +109,9 @@ export default { }, computed: { local_titles_url() { + let { href } = this.$router.resolve({ name: 'EHoldingsLocalTitlesList' }) return build_url( - "/cgi-bin/koha/erm/eholdings/local/titles", + href, this.filters ) }, @@ -123,14 +124,15 @@ export default { methods: { show_title: function (title_id) { this.$router.push( - "/cgi-bin/koha/erm/eholdings/ebsco/titles/" + title_id + { name: 'EHoldingsEBSCOTitlesShow', params: { title_id } } ) }, filter_table: async function () { if (this.filters.publication_title.length) { this.cannot_search = false + let { href } = this.$router.resolve({ name: 'EHoldingsEBSCOTitlesList' }) let new_route = build_url( - "/cgi-bin/koha/erm/eholdings/ebsco/titles", + href, this.filters ) this.$router.push(new_route) 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 26c60ea07b6..175ae497d98 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 82d0eb96119..a9dc56d9104 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") }} { if (response.status == 200) { this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/packages" + { name: 'EHoldingsLocalPackagesList' } ) setMessage(this.$__("Package updated")) } else { @@ -178,7 +178,7 @@ export default { createPackage(erm_package).then(response => { if (response.status == 201) { this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/packages" + { name: 'EHoldingsLocalPackagesList' } ) setMessage(this.$__("Package created")) } else { diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormConfirmDelete.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormConfirmDelete.vue index 6f7b43e6e68..5d9aea55d26 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormConfirmDelete.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormConfirmDelete.vue @@ -19,7 +19,7 @@ :value="$__('Yes, delete')" /> {{ $__("No, do not delete") }} { 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 1f22509533c..ec8de9c46d3 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,13 +5,13 @@ {{ $__("Package #%s").format(erm_package.package_id) }} @@ -68,7 +68,7 @@ :key="package_agreement.agreement_id" > {{ package_agreement.agreement.name }}
{{ $__("Close") }}
{{ $__("New package") }}{{ $__("Publication title") }}: {{ resource.title.publication_title }}{{ $__("Package") }}: {{ resource.package.name }} diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlePackagesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlePackagesList.vue index 85646aa2a45..3814688c6f2 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlePackagesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlePackagesList.vue @@ -23,11 +23,12 @@ export default { methods: { show_resource: function (resource_id) { this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/resources/" + resource_id + { name: 'EHoldingsLocalResourcesShow', params: { resource_id }} ) }, build_datatable: function () { let show_resource = this.show_resource + let router = this.$router let resources = this.resources let table_id = this.table_id @@ -59,13 +60,12 @@ 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: 'EHoldingsLocalResourcesShow', params: { resource_id }}) let n = createVNode( "a", { role: "button", - href: - "/cgi-bin/koha/erm/eholdings/local/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/EHoldingsLocalTitlesFormAdd.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormAdd.vue index ca3585b2cba..19b5ade5465 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 @@ -373,7 +373,7 @@
{{ $__("Cancel") }} { if (response.status == 200) { this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/titles" + { name: 'EHoldingsLocalTitlesList' } ) setMessage(this.$__("Title updated")) } else if (response.status == 201) { this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/titles" + { name: 'EHoldingsLocalTitlesList' } ) setMessage(this.$__("Title created")) } else { diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormConfirmDelete.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormConfirmDelete.vue index 3981fdfa134..09bab22e21a 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormConfirmDelete.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesFormConfirmDelete.vue @@ -19,7 +19,7 @@ :value="$__('Yes, delete')" /> {{ $__("No, do not delete") }} { e.preventDefault() show_title(row.title_id) 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 4d705a62c7d..ca749fbbeee 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 @@ -5,13 +5,13 @@ {{ $__("Title #%s").format(title.title_id) }} @@ -245,7 +245,7 @@
{{ $__("Close") }}
{{ $__("New title") }}   {{ $__("Import from list") }}