From 1972c25733daba7d0d4e9308c803f8aa2de2a15f Mon Sep 17 00:00:00 2001 From: Agustin Moyano Date: Wed, 1 Mar 2023 12:56:55 -0300 Subject: [PATCH] Bug 32991: Remove _is_loading warning, and improve 'ERMModule' disabled warning --- .../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 @@ @@ -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 ERMModule 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.25.1