summaryrefslogtreecommitdiff
path: root/src/views/Configuration
diff options
context:
space:
mode:
authorYoshie Muranaka <yoshiemuranaka@gmail.com>2020-12-09 19:52:23 +0300
committerYoshie Muranaka <yoshiemuranaka@gmail.com>2020-12-09 19:54:15 +0300
commitd73f496b2578e964450aacfd2f56d4dee5a83c97 (patch)
tree90a0b24c17178b7a14229438f094c437f3dc0dae /src/views/Configuration
parent00f5b79055f982d45beb483a1399568bd50aebc6 (diff)
downloadwebui-vue-d73f496b2578e964450aacfd2f56d4dee5a83c97.tar.xz
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
Diffstat (limited to 'src/views/Configuration')
-rw-r--r--src/views/Configuration/DateTimeSettings/DateTimeSettings.vue5
-rw-r--r--src/views/Configuration/NetworkSettings/NetworkSettings.vue3
2 files changed, 6 insertions, 2 deletions
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() {