Bugzilla – Attachment 149707 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: (follow-up) Fix copy/paste bug in local titles form add and fix bad link definition in Main.vue
Bug-32932-follow-up-Fix-copypaste-bug-in-local-tit.patch (text/plain), 13.49 KB, created by
Agustín Moyano
on 2023-04-14 19:21:58 UTC
(
hide
)
Description:
Bug 32932: (follow-up) Fix copy/paste bug in local titles form add and fix bad link definition in Main.vue
Filename:
MIME Type:
Creator:
Agustín Moyano
Created:
2023-04-14 19:21:58 UTC
Size:
13.49 KB
patch
obsolete
>From 38420feeae326f8c0f9e76158e31f7ef9fbd4b8f Mon Sep 17 00:00:00 2001 >From: Agustin Moyano <agustinmoyano@theke.io> >Date: Wed, 5 Apr 2023 13:00:51 +0000 >Subject: [PATCH] Bug 32932: (follow-up) Fix copy/paste bug in local titles > form add and fix bad link definition in Main.vue > >--- > .../prog/js/vue/components/ERM/AgreementsList.vue | 8 ++++---- > .../ERM/EHoldingsEBSCOPackageTitlesList.vue | 12 ++++++------ > .../components/ERM/EHoldingsEBSCOPackagesList.vue | 12 ++++++------ > .../vue/components/ERM/EHoldingsEBSCOTitlesList.vue | 4 ++-- > .../ERM/EHoldingsLocalPackageTitlesList.vue | 12 ++++++------ > .../components/ERM/EHoldingsLocalPackagesList.vue | 8 ++++---- > .../components/ERM/EHoldingsLocalTitlesFormAdd.vue | 4 ++-- > .../vue/components/ERM/EHoldingsLocalTitlesList.vue | 8 ++++---- > .../prog/js/vue/components/ERM/LicensesList.vue | 8 ++++---- > .../prog/js/vue/components/ERM/Main.vue | 8 ++------ > 10 files changed, 40 insertions(+), 44 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue >index 994561f9eb..907f5793e6 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/AgreementsList.vue >@@ -160,17 +160,17 @@ export default { > error => {} > ) > }, >- doShow: function (agreement, dt, event) { >+ doShow: function ({ agreement_id }, dt, event) { > event.preventDefault() > this.$router.push({ > name: "AgreementsShow", >- params: { agreement_id: agreement.agreement_id }, >+ params: { agreement_id }, > }) > }, >- doEdit: function (agreement, dt, event) { >+ doEdit: function ({ agreement_id }, dt, event) { > this.$router.push({ > name: "AgreementsFormAddEdit", >- params: { agreement_id: agreement.agreement_id }, >+ params: { agreement_id }, > }) > }, > doDelete: function (agreement, dt, event) { >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 4b075d43e4..e6c8588afc 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 >@@ -129,11 +129,11 @@ export default { > } > }, > methods: { >- doShow: function (resource, dt, event) { >+ doShow: function ({ resource_id }, dt, event) { > event.preventDefault() > this.$router.push({ > name: "EHoldingsEBSCOResourcesShow", >- params: { resource.resource_id }, >+ params: { resource_id }, > }) > }, > filter_table: function () { >@@ -189,10 +189,10 @@ export default { > }, > }, > ] >- let { href } = router.resolve({ >- name: "EHoldingsEBSCOResourcesShow", >- params: { resource_id: row.resource_id }, >- }) >+ let { href } = router.resolve({ >+ name: "EHoldingsEBSCOResourcesShow", >+ params: { resource_id: row.resource_id }, >+ }) > }, > }, > props: { >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 c43194e4a1..ab5565eb4a 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 >@@ -152,11 +152,11 @@ export default { > }, > }, > methods: { >- doShow: function (erm_package, dt, event) { >+ doShow: function ({ package_id }, dt, event) { > event.preventDefault() > this.$router.push({ > name: "EHoldingsEBSCOPackagesShow", >- params: { erm_package.package_id }, >+ params: { package_id }, > }) > }, > filter_table: async function () { >@@ -255,10 +255,10 @@ export default { > }, > }, > ] >- let { href } = router.resolve({ >- name: "EHoldingsEBSCOPackagesShow", >- params: { package_id: row.package_id }, >- }) >+ let { href } = router.resolve({ >+ name: "EHoldingsEBSCOPackagesShow", >+ params: { package_id: row.package_id }, >+ }) > }, > }, > components: { KohaTable }, >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 9f83b8da79..7b446b4d8d 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 >@@ -156,11 +156,11 @@ export default { > }, > }, > methods: { >- doShow: function (title, dt, event) { >+ doShow: function ({ title_id }, dt, event) { > event.preventDefault() > this.$router.push({ > name: "EHoldingsEBSCOTitlesShow", >- params: { title.title_id }, >+ params: { title_id }, > }) > }, > filter_table: async function () { >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 aabb57a82f..47ef0e0265 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 >@@ -42,11 +42,11 @@ export default { > } > }, > methods: { >- doShow: function (resource, dt, event) { >+ doShow: function ({ resource_id }, dt, event) { > event.preventDefault() > this.$router.push({ > name: "EHoldingsLocalResourcesShow", >- params: { resource.resource_id }, >+ params: { resource_id }, > }) > }, > getTableColumns: function () { >@@ -85,10 +85,10 @@ export default { > }, > }, > ] >- let { href } = router.resolve({ >- name: "EHoldingsLocalResourcesShow", >- params: { resource_id }, >- }) >+ let { href } = router.resolve({ >+ name: "EHoldingsLocalResourcesShow", >+ params: { resource_id }, >+ }) > }, > }, > props: { >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 a82d4e975c..4771d52a6c 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 >@@ -115,17 +115,17 @@ export default { > error => {} > ) > }, >- doShow: function (erm_package, dt, event) { >+ doShow: function ({ package_id }, dt, event) { > event.preventDefault() > this.$router.push({ > name: "EHoldingsLocalPackagesShow", >- params: { erm_package.package_id }, >+ params: { package_id }, > }) > }, >- doEdit: function (erm_package, dt, event) { >+ doEdit: function ({ package_id }, dt, event) { > this.$router.push({ > name: "EHoldingsLocalPackagesFormAddEdit", >- params: { erm_package.package_id }, >+ params: { package_id }, > }) > }, > doDelete: function (erm_package, dt, event) { >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 f83dbbe95d..19afc5e8f9 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 >@@ -503,7 +503,7 @@ export default { > success => { > setMessage(this.$__("Title updated")) > this.$router.push({ >- name: "EHoldingsLocalPackagesList", >+ name: "EHoldingsLocalTitlesList", > }) > }, > error => {} >@@ -513,7 +513,7 @@ export default { > success => { > setMessage(this.$__("Title created")) > this.$router.push({ >- name: "EHoldingsLocalPackagesList", >+ name: "EHoldingsLocalTitlesList", > }) > }, > 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 02929f0ebf..f98e9361a1 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 >@@ -107,17 +107,17 @@ export default { > error => {} > ) > }, >- doShow: function (title, dt, event) { >+ doShow: function ({ title_id }, dt, event) { > event.preventDefault() > this.$router.push({ > name: "EHoldingsLocalTitlesShow", >- params: { title.title_id }, >+ params: { title_id }, > }) > }, >- doEdit: function (title, dt, event) { >+ doEdit: function ({ title_id }, dt, event) { > this.$router.push({ > name: "EHoldingsLocalTitlesFormAddEdit", >- params: { title.title_id }, >+ params: { title_id }, > }) > }, > doDelete: function (title, dt, event) { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue >index d49a37ae9b..78acd16c48 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/LicensesList.vue >@@ -88,14 +88,14 @@ export default { > error => {} > ) > }, >- doShow: function (license, dt, event) { >+ doShow: function ({ license_id }, dt, event) { > event.preventDefault() >- this.$router.push({ name: "LicensesShow", params: { license.license_id } }) >+ this.$router.push({ name: "LicensesShow", params: { license_id } }) > }, >- doEdit: function (license, dt, event) { >+ doEdit: function ({ license_id }, dt, event) { > this.$router.push({ > name: "LicensesFormAddEdit", >- params: { licence.license_id }, >+ params: { license_id }, > }) > }, > doDelete: function (license, dt, event) { >diff --git a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue >index 13e77dac63..71685ee443 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue >+++ b/koha-tmpl/intranet-tmpl/prog/js/vue/components/ERM/Main.vue >@@ -78,9 +78,7 @@ > <ul> > <li> > <router-link >- :to="{ >- name: `EHoldings${provider}PackagesList`, >- }" >+ :to="`/cgi-bin/koha/erm/eholdings/${provider}/packages`" > > > <i > class="fa fa-archive" >@@ -92,9 +90,7 @@ > </li> > <li> > <router-link >- :to="{ >- name: `EHoldings${provider}TitlesList`, >- }" >+ :to="`/cgi-bin/koha/erm/eholdings/${provider}/titles`" > > > <i > class="fa fa-sort-alpha-asc" >-- >2.30.2
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