Attachment 149508 Details for Bug 33482 – Bug 33408: We need only one this.loaded call

[patch] Bug 33408: We need only one this.loaded call

Bug-33408-We-need-only-one-thisloaded-call.patch (text/plain), 2.10 KB, created by Pedro Amorim on 2023-04-12 08:23:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro Amorim

Created: 2023-04-12 08:23:36 UTC

Size: 2.10 KB

patch

obsolete

>From e82f0a60e3af6d5cd7ea6f06772d8117106087ad Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Wed, 5 Apr 2023 14:27:03 +0200
>Subject: [PATCH] Bug 33408: We need only one this.loaded call
>
>Signed-off-by: Pedro Amorim <pedro.amorim@ptfs-europe.com>
>
>https://bugs.koha-community.org/show_bug.cgi?id=33482
>---
> .../prog/js/vue/components/ERM/Main.vue            | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 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 9fe08ade2ff..edfb3b959d6 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,5 +1,5 @@
> <template>
>-    <div v-if="initialized">
>+    <div v-if="initialized && ERMModule == 1">
>         <div id="sub-header">
>             <Breadcrumb />
>             <Help />
>@@ -214,10 +214,7 @@ export default {
>                     error => {}
>                 )
>             )
>-            return Promise.all(promises).then(values => {
>-                this.loaded()
>-                this.initialized = true
>-            })
>+            return Promise.all(promises)
>         }
> 
>         const sysprefs_client = APIClient.sysprefs
>@@ -225,8 +222,7 @@ export default {
>             .get("ERMModule")
>             .then(value => {
>                 this.ERMModule = value.value
>-                if (this.ERMModule == 0) {
>-                    this.loaded()
>+                if (this.ERMModule != 1) {
>                     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'
>@@ -236,6 +232,10 @@ export default {
>                 }
>                 return fetch_config()
>             })
>+            .then(() => {
>+                this.loaded()
>+                this.initialized = true
>+            })
>     },
>     components: {
>         Breadcrumb,
>-- 
>2.30.2

Actions: View | Diff | Splinter Review

Attachments on bug 33482: 149435 | 149439 | 149440 | 149450 | 149508 | 150292