From d73f496b2578e964450aacfd2f56d4dee5a83c97 Mon Sep 17 00:00:00 2001
From: Yoshie Muranaka <yoshiemuranaka@gmail.com>
Date: Wed, 9 Dec 2020 08:52:23 -0800
Subject: Fix loading hang

Import and add loading property to pages that are disabling
forms based on LoadingBarMixin loading property.

Signed-off-by: Yoshie Muranaka <yoshiemuranaka@gmail.com>
Change-Id: I1669bff2572422327566a3afe023633eb0b729f4
---
 src/views/Configuration/DateTimeSettings/DateTimeSettings.vue | 5 ++++-
 src/views/Configuration/NetworkSettings/NetworkSettings.vue   | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/views/Configuration')

diff --git a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue b/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue
index d3c19d57..6e8c9671 100644
--- a/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue
+++ b/src/views/Configuration/DateTimeSettings/DateTimeSettings.vue
@@ -210,7 +210,9 @@ import PageSection from '@/components/Global/PageSection';
 
 import BVToastMixin from '@/components/Mixins/BVToastMixin';
 import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
-import LocalTimezoneLabelMixin from '@/components/Mixins/LocalTimezoneLabelMixin';
+import LocalTimezoneLabelMixin, {
+  loading,
+} from '@/components/Mixins/LocalTimezoneLabelMixin';
 import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js';
 
 import { mapState } from 'vuex';
@@ -243,6 +245,7 @@ export default {
         },
         ntp: { firstAddress: '', secondAddress: '', thirdAddress: '' },
       },
+      loading,
     };
   },
   validations() {
diff --git a/src/views/Configuration/NetworkSettings/NetworkSettings.vue b/src/views/Configuration/NetworkSettings/NetworkSettings.vue
index 3260dffb..4cf0f83d 100644
--- a/src/views/Configuration/NetworkSettings/NetworkSettings.vue
+++ b/src/views/Configuration/NetworkSettings/NetworkSettings.vue
@@ -299,7 +299,7 @@
 import IconTrashcan from '@carbon/icons-vue/es/trash-can/20';
 import IconAdd from '@carbon/icons-vue/es/add--alt/20';
 import BVToastMixin from '@/components/Mixins/BVToastMixin';
-import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
+import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
 import PageSection from '@/components/Global/PageSection';
 import PageTitle from '@/components/Global/PageTitle';
 import TableRowAction from '@/components/Global/TableRowAction';
@@ -365,6 +365,7 @@ export default {
         ipv4StaticTableItems: [],
         dnsStaticTableItems: [],
       },
+      loading,
     };
   },
   validations() {
-- 
cgit v1.2.3