Bugzilla – Attachment 146624 Details for
Bug 32932
Re-structure Vue router-links to use "name" instead of urls
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32932: Update router to use name property for eholdings
Bug-32932-Update-router-to-use-name-property-for-e.patch (text/plain), 35.64 KB, created by
Matt Blenkinsop
on 2023-02-14 14:05:07 UTC
(
hide
)
Description:
Bug 32932: Update router to use name property for eholdings
Filename:
MIME Type:
Creator:
Matt Blenkinsop
Created:
2023-02-14 14:05:07 UTC
Size:
35.64 KB
patch
obsolete
>From 4074ba0b17ba975b8853ca4279508b4982fa0462 Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >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" > > > <router-link >- :to="`/cgi-bin/koha/erm/agreements/${package_agreement.agreement.agreement_id}`" >+ :to="{ name: 'AgreementsShow', params: { agreement_id: package_agreement.agreement.agreement_id } }" > >{{ package_agreement.agreement.name }}</router-link > > > >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 @@ > </fieldset> > <fieldset class="action"> > <router-link >- to="/cgi-bin/koha/erm/eholdings/ebsco/packages" >+ :to="{ name: 'EHoldingsEBSCOPackagesList'}" > role="button" > class="cancel" > >{{ $__("Close") }}</router-link >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOResourcesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOResourcesShow.vue >index 6753ce2acf6..cc7ca6a9c34 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOResourcesShow.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsEBSCOResourcesShow.vue >@@ -37,7 +37,7 @@ > <label>{{ $__("Publication title") }}:</label> > <span > ><router-link >- :to="`/cgi-bin/koha/erm/eholdings/ebsco/titles/${resource.title_id}`" >+ :to="{ name: 'EHoldingsEBSCOTitlesShow', params: { title_id: resource.title_id } }" > >{{ > resource.title.publication_title > }}</router-link >@@ -77,7 +77,7 @@ > <label>{{ $__("Package") }}:</label> > <span > ><router-link >- :to="`/cgi-bin/koha/erm/eholdings/ebsco/packages/${resource.package_id}`" >+ :to="{ name: 'EHoldingsEBSCOPackagesShow', params: { package_id: resource.package_id } }" > >{{ resource.package.name }}</router-link > ></span > > >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 @@ > </fieldset> > <fieldset class="action"> > <router-link >- to="/cgi-bin/koha/erm/eholdings/ebsco/titles" >+ :to="{ name: 'EHoldingsEBSCOTitlesList' }" > role="button" > class="cancel" > >{{ $__("Close") }}</router-link >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue >index f325f41d00d..50ddc3b3703 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalPackageTitlesList.vue >@@ -28,11 +28,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 package_id = this.package_id > let get_lib_from_av = this.get_lib_from_av > let map_av_dt_filter = this.map_av_dt_filter >@@ -87,13 +88,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/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 @@ > <fieldset class="action"> > <input type="submit" value="Submit" /> > <router-link >- to="/cgi-bin/koha/erm/eholdings/local/packages" >+ :to="{ name: 'EHoldingsLocalPackagesList' }" > role="button" > class="cancel" > >{{ $__("Cancel") }}</router-link >@@ -167,7 +167,7 @@ export default { > editPackage(erm_package).then(response => { > 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')" > /> > <router-link >- to="/cgi-bin/koha/erm/eholdings/local/packages" >+ :to="{ name: 'EHoldingsLocalPackagesList' }" > role="button" > class="cancel" > >{{ $__("No, do not delete") }}</router-link >@@ -71,7 +71,7 @@ export default { > if (response.status == 204) { > setMessage(this.$__("Package deleted")) > this.$router.push( >- "/cgi-bin/koha/erm/eholdings/local/packages" >+ { name: 'EHoldingsLocalPackagesList' } > ) > } else { > setError(response.message || response.statusText) >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 2fa3f105fc5..3a5e3b430b6 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 >@@ -65,24 +65,24 @@ export default { > }, > show_package: function (package_id) { > this.$router.push( >- "/cgi-bin/koha/erm/eholdings/local/packages/" + package_id >+ { name: 'EHoldingsLocalPackagesShow', params: { package_id }} > ) > }, > edit_package: function (package_id) { > this.$router.push( >- "/cgi-bin/koha/erm/eholdings/local/packages/edit/" + package_id >+ { name: 'EHoldingsLocalPackagesFormAddEdit', params: { package_id }} > ) > }, > delete_package: function (package_id) { > this.$router.push( >- "/cgi-bin/koha/erm/eholdings/local/packages/delete/" + >- package_id >+ { 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 >@@ -251,13 +251,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: '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 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) }} > <span class="action_links"> > <router-link >- :to="`/cgi-bin/koha/erm/eholdings/local/packages/edit/${erm_package.package_id}`" >+ :to="{ name: 'EHoldingsLocalPackagesFormAddEdit', params: { package_id: erm_package.package_id } }" > :title="$__('Edit')" > ><i class="fa fa-pencil"></i > ></router-link> > > <router-link >- :to="`/cgi-bin/koha/erm/eholdings/local/packages/delete/${erm_package.package_id}`" >+ :to="{ name: 'EHoldingsLocalPackagesFormConfirmDelete', params: { package_id: erm_package.package_id } }" > :title="$__('Delete')" > ><i class="fa fa-trash"></i > ></router-link> >@@ -68,7 +68,7 @@ > :key="package_agreement.agreement_id" > > > <router-link >- :to="`/cgi-bin/koha/erm/agreements/${package_agreement.agreement.agreement_id}`" >+ :to="{ name: 'AgreementsShow', params: { agreement_id: package_agreement.agreement.agreement_id } }" > >{{ > package_agreement.agreement.name > }}</router-link >@@ -93,7 +93,7 @@ > </fieldset> > <fieldset class="action"> > <router-link >- to="/cgi-bin/koha/erm/eholdings/local/packages" >+ :to="{ name: 'EHoldingsLocalPackagesList' }" > role="button" > class="cancel" > >{{ $__("Close") }}</router-link >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 6b31743d057..49610bd8912 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 @@ > <template> > <div id="toolbar" class="btn-toolbar"> > <router-link >- to="/cgi-bin/koha/erm/eholdings/local/packages/add" >+ :to="{ name: 'EHoldingsLocalPackagesFormAdd' }" > class="btn btn-default" > ><font-awesome-icon icon="plus" /> > {{ $__("New package") }}</router-link >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalResourcesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalResourcesShow.vue >index 6f2cc09e038..b472a95f12d 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalResourcesShow.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalResourcesShow.vue >@@ -18,7 +18,7 @@ > <label>{{ $__("Publication title") }}:</label> > <span > ><router-link >- :to="`/cgi-bin/koha/erm/eholdings/local/titles/${resource.title_id}`" >+ :to="{ name: 'EHoldingsLocalTitlesShow', params: { title_id: resource.title_id} }" > >{{ > resource.title.publication_title > }}</router-link >@@ -58,7 +58,7 @@ > <label>{{ $__("Package") }}:</label> > <span > ><router-link >- :to="`/cgi-bin/koha/erm/eholdings/local/packages/${resource.package_id}`" >+ :to="{ name: 'EHoldingsLocalPackagesShow', params: { package_id: resource.package_id} }" > >{{ resource.package.name }}</router-link > ></span > > >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 @@ > <fieldset class="action"> > <input type="submit" value="Submit" /> > <router-link >- to="/cgi-bin/koha/erm/eholdings/local/titles" >+ :to="{ name: 'EHoldingsLocalTitlesList' }" > role="button" > class="cancel" > >{{ $__("Cancel") }}</router-link >@@ -510,12 +510,12 @@ export default { > response => { > 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')" > /> > <router-link >- to="/cgi-bin/koha/erm/eholdings/local/titles" >+ :to="{ name: 'EHoldingsLocalTitlesList' }" > role="button" > class="cancel" > >{{ $__("No, do not delete") }}</router-link >@@ -70,7 +70,7 @@ export default { > if (response.status == 204) { > setMessage(this.$__("Title deleted")) > this.$router.push( >- "/cgi-bin/koha/erm/eholdings/local/titles" >+ { name: 'EHoldingsLocalTitlesList' } > ) > } else { > setError(response.message || response.statusText) >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 a30c5a65ad5..2d54e66e1f6 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 >@@ -59,23 +59,24 @@ export default { > }, > show_title: function (title_id) { > this.$router.push( >- "/cgi-bin/koha/erm/eholdings/local/titles/" + title_id >+ { name: 'EHoldingsLocalTitlesShow', params: { title_id }} > ) > }, > edit_title: function (title_id) { > this.$router.push( >- "/cgi-bin/koha/erm/eholdings/local/titles/edit/" + title_id >+ { name: 'EHoldingsLocalTitlesFormAddEdit', params: { title_id }} > ) > }, > delete_title: function (title_id) { > this.$router.push( >- "/cgi-bin/koha/erm/eholdings/local/titles/delete/" + title_id >+ { 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 >@@ -234,13 +235,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: '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 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) }} > <span class="action_links"> > <router-link >- :to="`/cgi-bin/koha/erm/eholdings/local/titles/edit/${title.title_id}`" >+ :to="{ name: 'EHoldingsLocalTitlesFormAddEdit', params: { title_id: title.title_id } }" > :title="$__('Edit')" > ><i class="fa fa-pencil"></i > ></router-link> > > <router-link >- :to="`/cgi-bin/koha/erm/eholdings/local/titles/delete/${title.title_id}`" >+ :to="{ name: 'EHoldingsLocalTitlesFormConfirmDelete', params: { title_id: title.title_id } }" > :title="$__('Delete')" > ><i class="fa fa-trash"></i > ></router-link> >@@ -245,7 +245,7 @@ > </fieldset> > <fieldset class="action"> > <router-link >- to="/cgi-bin/koha/erm/eholdings/local/titles" >+ :to="{ name: 'EHoldingsLocalTitlesList' }" > role="button" > class="cancel" > >{{ $__("Close") }}</router-link >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesToolbar.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesToolbar.vue >index 027af774474..f9495d95c1e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesToolbar.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesToolbar.vue >@@ -1,14 +1,14 @@ > <template> > <div id="toolbar" class="btn-toolbar"> > <router-link >- to="/cgi-bin/koha/erm/eholdings/local/titles/add" >+ :to="{ name: 'EHoldingsLocalTitlesFormAdd' }" > class="btn btn-default" > ><font-awesome-icon icon="plus" /> > {{ $__("New title") }}</router-link > > > > <router-link >- to="/cgi-bin/koha/erm/eholdings/local/titles/import" >+ :to="{ name: 'EHoldingsLocalTitlesFormImport' }" > class="btn btn-default" > ><font-awesome-icon icon="plus" /> > {{ $__("Import from list") }}</router-link >-- >2.37.1 (Apple Git-137.1)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 32932
:
146439
|
146442
|
146616
|
146617
|
146618
|
146624
|
146625
|
146965
|
146966
|
146967
|
146968
|
147119
|
147120
|
147121
|
147122
|
148115
|
148551
|
148552
|
148553
|
148554
|
148558
|
148559
|
148560
|
148561
|
149210
|
149707
|
149709
|
149934
|
149935
|
151529
|
152231