Bugzilla – Attachment 149452 Details for
Bug 33483
Cannot link EBSCO's package with local agreement
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 33483: Update the way we distinguish if AgreementsList is called from EHoldingsEBSCOPackageAgreements or not
Bug-33483-Update-the-way-we-distinguish-if-Agreeme.patch (text/plain), 3.75 KB, created by
Pedro Amorim
on 2023-04-11 16:34:02 UTC
(
hide
)
Description:
Bug 33483: Update the way we distinguish if AgreementsList is called from EHoldingsEBSCOPackageAgreements or not
Filename:
MIME Type:
Creator:
Pedro Amorim
Created:
2023-04-11 16:34:02 UTC
Size:
3.75 KB
patch
obsolete
>From a3abd0743b516b9935acdf0319888e8945e03c94 Mon Sep 17 00:00:00 2001 >From: Pedro Amorim <pedro.amorim@ptfs-europe.com> >Date: Tue, 11 Apr 2023 16:33:39 +0000 >Subject: [PATCH] Bug 33483: Update the way we distinguish if AgreementsList is > called from EHoldingsEBSCOPackageAgreements or not > >--- > .../js/vue/components/ERM/AgreementsList.vue | 22 +++++++++---------- > .../ERM/EHoldingsEBSCOPackageAgreements.vue | 2 +- > 2 files changed, 11 insertions(+), 13 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 d05d6323b88..18a38af1eb4 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 >@@ -1,7 +1,7 @@ > <template> > <div v-if="!initialized">{{ $__("Loading") }}</div> > <div v-else id="agreements_list"> >- <Toolbar v-if="before_route_entered" /> >+ <Toolbar v-if="!embedded" /> > <fieldset v-if="agreement_count > 0" class="filters"> > <label for="expired_filter">{{ $__("Filter by expired") }}:</label> > <input >@@ -100,8 +100,6 @@ export default { > fp_config: flatpickr_defaults, > agreement_count: 0, > initialized: false, >- before_route_entered: false, >- building_table: false, > tableOptions: { > columns: this.getTableColumns(), > options: { embed: "user_roles,vendor" }, >@@ -143,11 +141,7 @@ export default { > }, > beforeRouteEnter(to, from, next) { > next(vm => { >- vm.before_route_entered = true // FIXME This is ugly, but we need to distinguish when it's used as main component or child component (from EHoldingsEBSCOPAckagesShow for instance) >- if (!vm.building_table) { >- vm.building_table = true >- vm.getAgreementCount().then(() => (vm.initialized = true)) >- } >+ vm.getAgreementCount().then(() => (vm.initialized = true)) > }) > }, > methods: { >@@ -210,7 +204,7 @@ export default { > this.$emit("close") > }, > filter_table: async function () { >- if (this.before_route_entered) { >+ if (!embedded) { > let new_route = build_url( > "/cgi-bin/koha/erm/agreements", > this.filters >@@ -314,13 +308,17 @@ export default { > }, > }, > mounted() { >- // We this component is mounted from EHoldingsEBSCOPackageAgreements >- if (!this.building_table) { >- this.building_table = true >+ if (this.embedded) { > this.getAgreementCount().then(() => (this.initialized = true)) > } > }, > components: { flatPickr, Toolbar, KohaTable }, >+ props: { >+ embedded: { >+ type: Boolean, >+ default: false, >+ }, >+ }, > name: "AgreementsList", > emits: ["select-agreement", "close"], > } >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..d7ecaf80c2d 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 >@@ -1,7 +1,7 @@ > <template> > <transition name="modal"> > <div v-if="showModal" class="modal"> >- <AgreementsList @select-agreement="addAgreement" /> >+ <AgreementsList :embedded="true" @select-agreement="addAgreement" /> > <input > type="button" > @click="showModal = false" >-- >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 33483
:
149437
|
149452
|
149455
|
149456
|
149470
|
149471
|
149472
|
149473
|
149527
|
149528
|
149529
|
149555
|
149564
|
149565
|
149566
|
149567
|
149568
|
149569
|
149847
|
149848
|
149849
|
149850
|
149851
|
149852