From 83877d0c0a64ee5419d10af404e09a0a1a3f73dc 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 | 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 ++++---- ...HoldingsLocalPackagesFormConfirmDelete.vue | 6 ++-- .../ERM/EHoldingsLocalPackagesList.vue | 31 ++++++++++-------- .../ERM/EHoldingsLocalPackagesShow.vue | 21 +++++++++--- .../ERM/EHoldingsLocalPackagesToolbar.vue | 2 +- .../ERM/EHoldingsLocalResourcesShow.vue | 10 ++++-- .../ERM/EHoldingsLocalTitlePackagesList.vue | 16 ++++++---- .../ERM/EHoldingsLocalTitlesFormAdd.vue | 14 ++++---- .../EHoldingsLocalTitlesFormConfirmDelete.vue | 6 ++-- .../ERM/EHoldingsLocalTitlesList.vue | 30 ++++++++++------- .../ERM/EHoldingsLocalTitlesShow.vue | 12 +++++-- .../ERM/EHoldingsLocalTitlesToolbar.vue | 4 +-- 21 files changed, 177 insertions(+), 113 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 734db3e5946..a98f4940d25 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 99b3060086a..ff34537ec74 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 27d54c59311..2ada0dd5674 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 a90b0d1523f..b0a1c888d9f 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..8d7ee1e8c29 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 bbd6d54e8c6..a3d840fb6a5 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 8ea3ef6fde5..53b6d2b5e22 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 268af004b2e..8e58e09d105 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/EHoldingsLocalPackagesFormConfirmDelete.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackagesFormConfirmDelete.vue index 352e18b01d7..ec2eada8257 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") }} { setMessage(this.$__("Package deleted")) - 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 348edf92df7..59ee6a364f1 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 @@ -69,25 +69,28 @@ 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) { - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/packages/delete/" + - package_id - ) + this.$router.push({ + name: "EHoldingsLocalPackagesFormConfirmDelete", + params: { package_id }, + }) }, build_datatable: function () { 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 @@ -256,13 +259,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 f0bdd271081..537a431d8e3 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,19 @@ {{ $__("Package #%s").format(erm_package.package_id) }} @@ -68,7 +74,14 @@ :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..91ab7732a9f 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 @@ -22,12 +22,14 @@ export default { }, methods: { show_resource: function (resource_id) { - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/resources/" + resource_id - ) + this.$router.push({ + 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 +61,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: "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 2c30ab9e0e0..f83dbbe95d7 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") }} { setMessage(this.$__("Title updated")) - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/titles" - ) + this.$router.push({ + name: "EHoldingsLocalPackagesList", + }) }, error => {} ) @@ -512,9 +512,9 @@ export default { client.localTitles.create(title).then( success => { setMessage(this.$__("Title created")) - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/titles" - ) + this.$router.push({ + name: "EHoldingsLocalPackagesList", + }) }, error => {} ) 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 0e10e8eeadc..3faff975c17 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") }} { setMessage(this.$__("Title deleted")) - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/titles" - ) + this.$router.push({ name: "EHoldingsLocalPackagesList" }) }, error => {} ) diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue index 90ab757f389..3bfaec89d94 100644 --- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue +++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue @@ -68,24 +68,28 @@ export default { ) }, show_title: function (title_id) { - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/titles/" + title_id - ) + this.$router.push({ + name: "EHoldingsLocalTitlesShow", + params: { title_id }, + }) }, edit_title: function (title_id) { - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/titles/edit/" + title_id - ) + this.$router.push({ + name: "EHoldingsLocalTitlesFormAddEdit", + params: { title_id }, + }) }, delete_title: function (title_id) { - this.$router.push( - "/cgi-bin/koha/erm/eholdings/local/titles/delete/" + title_id - ) + this.$router.push({ + name: "EHoldingsLocalTitlesFormConfirmDelete", + params: { title_id }, + }) }, build_datatable: function () { let show_title = this.show_title let edit_title = this.edit_title let delete_title = this.delete_title + 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 @@ -244,13 +248,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: "EHoldingsLocalTitlesShow", + params: { title_id: row.title_id }, + }) let n = createVNode( "a", { role: "button", - href: - "/cgi-bin/koha/erm/eholdings/local/titles/" + - row.title_id, + href, onClick: e => { 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 59f0bf51044..31b686a4081 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,19 @@ {{ $__("Title #%s").format(title.title_id) }} @@ -245,7 +251,7 @@
{{ $__("Close") }}
{{ $__("New title") }}   {{ $__("Import from list") }}