Bugzilla – Attachment 147573 Details for
Bug 32991
Improve our Dialog component and remove routes for deletion
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 32991: Remove _is_loading warning, and improve 'ERMModule' disabled warning
Bug-32991-Remove-isloading-warning-and-improve-ERM.patch (text/plain), 3.00 KB, created by
Pedro Amorim
on 2023-03-01 17:57:42 UTC
(
hide
)
Description:
Bug 32991: Remove _is_loading warning, and improve 'ERMModule' disabled warning
Filename:
MIME Type:
Creator:
Pedro Amorim
Created:
2023-03-01 17:57:42 UTC
Size:
3.00 KB
patch
obsolete
>From 12689543a9db63484d6a1a3109b9ec1a3538be3b Mon Sep 17 00:00:00 2001 >From: Agustin Moyano <agustinmoyano@theke.io> >Date: Wed, 1 Mar 2023 12:56:55 -0300 >Subject: [PATCH] Bug 32991: Remove _is_loading warning, and improve > 'ERMModule' disabled warning > >Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com> >--- > .../prog/js/vue/components/ERM/Main.vue | 37 +++++++++---------- > 1 file changed, 17 insertions(+), 20 deletions(-) > >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 31f5940520..d997c5fd9b 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 >@@ -1,15 +1,12 @@ > <template> >- <div v-if="_is_loading"> >- <Dialog /> >- </div> >- <div v-else-if="ERMModule"> >+ <div> > <Breadcrumb /> >- <div class="main container-fluid"> >+ <div class="main container-fluid" v-if="ERMModule"> > <div class="row"> > <div class="col-sm-10 col-sm-push-2"> > <main> > <Dialog /> >- <router-view /> >+ <router-view/> > </main> > </div> > >@@ -111,13 +108,9 @@ > </div> > </div> > </div> >- </div> >- <div v-else> >- {{ >- $__( >- "The e-resource management module is disabled, turn on 'ERMModule' to use it" >- ) >- }} >+ <div class="main container-fluid" v-else> >+ <Dialog /> >+ </div> > </div> > </template> > >@@ -137,17 +130,16 @@ export default { > > const mainStore = inject("mainStore") > >- // Note that we cannot use loading and loaded from messages >- // Pinia is not initiated yet there >- const { _is_loading } = storeToRefs(mainStore) >+ const { loading, loaded, setError } = mainStore > > return { > vendorStore, > AVStore, >- mainStore, >+ setError, > erm_providers, > ERMModule, >- _is_loading, >+ loading, >+ loaded, > } > }, > data() { >@@ -156,7 +148,12 @@ export default { > } > }, > beforeCreate() { >- this.mainStore._is_loading = true >+ if(!this.ERMModule) { >+ return this.setError(this.$__( >+ 'The e-resource management module is disabled, turn on <a href="/cgi-bin/koha/admin/preferences.pl?tab=&op=search&searchfield=ERMModule">ERMModule</a> to use it' >+ ), false); >+ } >+ this.loading() > > const acq_client = APIClient.acquisition > acq_client.vendors.getAll().then( >@@ -190,7 +187,7 @@ export default { > this.AVStore[av_var] = av_match.authorised_values; > > }) >- }).then(() => (this.mainStore._is_loading = false)); >+ }).then(() => (this.loaded())); > }, > components: { > Breadcrumb, >-- >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 32991
:
146828
|
146829
|
147051
|
147052
|
147053
|
147054
|
147082
|
147083
|
147281
|
147282
|
147291
|
147305
|
147350
|
147383
|
147384
|
147385
|
147387
|
147388
|
147389
|
147390
|
147391
|
147392
|
147393
|
147394
|
147429
|
147439
|
147445
|
147447
|
147448
|
147449
|
147450
|
147451
|
147452
|
147453
|
147454
|
147455
|
147456
|
147461
|
147483
|
147485
|
147486
|
147487
|
147542
|
147543
|
147544
|
147545
|
147546
|
147547
|
147548
|
147549
|
147550
|
147551
|
147552
|
147553
|
147554
|
147569
|
147573
|
147584
|
147588
|
147589
|
147590
|
147591
|
147592
|
147593
|
147594
|
147595
|
147596
|
147597
|
147598
|
147599
|
147600
|
147601
|
147602
|
147603
|
147604
|
147937
|
147938
|
147939
|
147940
|
147941
|
147942
|
147943
|
147944
|
147945
|
147946
|
147947
|
147948
|
147949
|
147950
|
147951