Bugzilla – Attachment 148553 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), 37.02 KB, created by
Agustín Moyano
on 2023-03-22 14:13:29 UTC
(
hide
)
Description:
Bug 32932: Update router to use name property for eholdings
Filename:
MIME Type:
Creator:
Agustín Moyano
Created:
2023-03-22 14:13:29 UTC
Size:
37.02 KB
patch
obsolete
>From bb99803fb5991a7c2085e5a0aec2730229d099e1 Mon Sep 17 00:00:00 2001 >From: Matt Blenkinsop <matt.blenkinsop@ptfs-europe.com> >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 >--- > .../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" > > > <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 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 @@ > </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 68d5e23e31..36aeef7501 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,10 @@ > <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 +80,10 @@ > <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 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 @@ > </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 f325f41d00..316cbbec92 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 >@@ -27,12 +27,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 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 +89,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/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 @@ > <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 >@@ -184,9 +184,9 @@ export default { > client.localPackages.update(erm_package, package_id).then( > success => { > 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) }} > <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> >@@ -69,7 +72,14 @@ > :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 >@@ -94,7 +104,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 >@@ -180,9 +190,9 @@ export default { > ), > true > ) >- 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/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 @@ > <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 3a043cfd2c..6798e36d87 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,10 @@ > <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 +61,10 @@ > <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 85646aa2a4..91ab7732a9 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 2c30ab9e0e..f83dbbe95d 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 >@@ -502,9 +502,9 @@ export default { > client.localTitles.update(title, title_id).then( > success => { > 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/EHoldingsLocalTitlesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/EHoldingsLocalTitlesList.vue >index d9cec18f56..b6fb4794b7 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 >@@ -72,14 +72,16 @@ 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, title_publication_title) { > this.setConfirmationDialog( >@@ -115,6 +117,7 @@ export default { > 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 >@@ -279,13 +282,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 e6efc4a339..24fdddf81a 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,7 +5,10 @@ > {{ $__("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> >@@ -246,7 +249,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 >@@ -346,9 +349,9 @@ export default { > ), > true > ) >- this.$router.push( >- "/cgi-bin/koha/erm/eholdings/local/titles" >- ) >+ this.$router.push({ >+ name: "EHoldingsLocalTitlesList", >+ }) > }, > error => {} > ) >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 027af77447..f9495d95c1 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 >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue >index 5abe50fcce..19c853f4aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesShow.vue >@@ -219,7 +219,7 @@ export default { > ), > true > ) >- this.$router.push({ name: 'LicensesList' }) >+ this.$router.push({ name: "LicensesList" }) > }, > error => {} > ) >-- >2.25.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