summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey V.Kosteltsev <AKosteltsev@IBS.RU>2022-07-07 20:37:13 +0300
committerAndrey V.Kosteltsev <AKosteltsev@IBS.RU>2022-07-07 20:37:13 +0300
commit40c493597703305ae732b414bda83a4f00b25745 (patch)
treef4f60eac523fccd9a3aedb8fb5c09a75434d1e3e
parent08117f381c307ee8d45d1aefddc67cf6d93fbe7b (diff)
parent72b0bc1e6cbec314f6c6298a61e03b9db343e47e (diff)
downloadwebui-vue-40c493597703305ae732b414bda83a4f00b25745.tar.xz
Merge branch 'sila' into sila-ui
-rw-r--r--src/views/_ibs/Operations/Firmware/Firmware.vue5
-rw-r--r--src/views/_ibs/Operations/Firmware/FirmwareCardsBmc.vue4
-rw-r--r--src/views/_ibs/Operations/Firmware/FirmwareFormUpdate.vue4
-rw-r--r--src/views/_ibs/ResourceManagement/Power.vue4
-rw-r--r--src/views/_ibs/SecurityAndAccess/Ldap/Ldap.vue4
-rw-r--r--src/views/_ibs/Settings/DateTime/DateTime.vue4
-rw-r--r--src/views/_ibs/Settings/Network/Network.vue4
7 files changed, 21 insertions, 8 deletions
diff --git a/src/views/_ibs/Operations/Firmware/Firmware.vue b/src/views/_ibs/Operations/Firmware/Firmware.vue
index 6e65b848..8dbd206b 100644
--- a/src/views/_ibs/Operations/Firmware/Firmware.vue
+++ b/src/views/_ibs/Operations/Firmware/Firmware.vue
@@ -43,8 +43,9 @@ import FormUpdate from './FirmwareFormUpdate';
import HostCards from './FirmwareCardsHost';
import PageSection from '@/components/_ibs/Global/PageSection';
import PageTitle from '@/components/_ibs/Global/PageTitle';
-
-import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin';
+import LoadingBarMixin, {
+ loading,
+} from '@/components/_ibs/Mixins/LoadingBarMixin';
export default {
name: 'FirmwareSingleImage',
diff --git a/src/views/_ibs/Operations/Firmware/FirmwareCardsBmc.vue b/src/views/_ibs/Operations/Firmware/FirmwareCardsBmc.vue
index 76d67f96..bca682bd 100644
--- a/src/views/_ibs/Operations/Firmware/FirmwareCardsBmc.vue
+++ b/src/views/_ibs/Operations/Firmware/FirmwareCardsBmc.vue
@@ -54,7 +54,9 @@
<script>
import IconSwitch from '@carbon/icons-vue/es/arrows--horizontal/20';
import PageSection from '@/components/_ibs/Global/PageSection';
-import LoadingBarMixin, { loading } from '@/components/_ibs/Mixins/LoadingBarMixin';
+import LoadingBarMixin, {
+ loading,
+} from '@/components/_ibs/Mixins/LoadingBarMixin';
import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
import ModalSwitchToRunning from './FirmwareModalSwitchToRunning';
diff --git a/src/views/_ibs/Operations/Firmware/FirmwareFormUpdate.vue b/src/views/_ibs/Operations/Firmware/FirmwareFormUpdate.vue
index 875ce283..c27bac26 100644
--- a/src/views/_ibs/Operations/Firmware/FirmwareFormUpdate.vue
+++ b/src/views/_ibs/Operations/Firmware/FirmwareFormUpdate.vue
@@ -76,7 +76,9 @@
import { requiredIf } from 'vuelidate/lib/validators';
import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
-import LoadingBarMixin, { loading } from '@/components/_ibs/Mixins/LoadingBarMixin';
+import LoadingBarMixin, {
+ loading,
+} from '@/components/_ibs/Mixins/LoadingBarMixin';
import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
import FormFile from '@/components/_ibs/Global/FormFile';
diff --git a/src/views/_ibs/ResourceManagement/Power.vue b/src/views/_ibs/ResourceManagement/Power.vue
index 6e04d6cc..b58c33ec 100644
--- a/src/views/_ibs/ResourceManagement/Power.vue
+++ b/src/views/_ibs/ResourceManagement/Power.vue
@@ -85,7 +85,9 @@
<script>
import PageTitle from '@/components/_ibs/Global/PageTitle';
-import LoadingBarMixin, { loading } from '@/components/_ibs/Mixins/LoadingBarMixin';
+import LoadingBarMixin, {
+ loading,
+} from '@/components/_ibs/Mixins/LoadingBarMixin';
import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
import { requiredIf, between } from 'vuelidate/lib/validators';
diff --git a/src/views/_ibs/SecurityAndAccess/Ldap/Ldap.vue b/src/views/_ibs/SecurityAndAccess/Ldap/Ldap.vue
index 32247ee0..4fb3d818 100644
--- a/src/views/_ibs/SecurityAndAccess/Ldap/Ldap.vue
+++ b/src/views/_ibs/SecurityAndAccess/Ldap/Ldap.vue
@@ -238,7 +238,9 @@ import { requiredIf } from 'vuelidate/lib/validators';
import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin';
-import LoadingBarMixin, { loading } from '@/components/_ibs/Mixins/LoadingBarMixin';
+import LoadingBarMixin, {
+ loading,
+} from '@/components/_ibs/Mixins/LoadingBarMixin';
import InputPasswordToggle from '@/components/_ibs/Global/InputPasswordToggle';
import PageTitle from '@/components/_ibs/Global/PageTitle';
import PageSection from '@/components/_ibs/Global/PageSection';
diff --git a/src/views/_ibs/Settings/DateTime/DateTime.vue b/src/views/_ibs/Settings/DateTime/DateTime.vue
index 4f187eed..0f905ccb 100644
--- a/src/views/_ibs/Settings/DateTime/DateTime.vue
+++ b/src/views/_ibs/Settings/DateTime/DateTime.vue
@@ -203,7 +203,9 @@ import PageTitle from '@/components/_ibs/Global/PageTitle';
import PageSection from '@/components/_ibs/Global/PageSection';
import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
-import LoadingBarMixin, { loading } from '@/components/_ibs/Mixins/LoadingBarMixin';
+import LoadingBarMixin, {
+ loading,
+} from '@/components/_ibs/Mixins/LoadingBarMixin';
import LocalTimezoneLabelMixin from '@/components/_ibs/Mixins/LocalTimezoneLabelMixin';
import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js';
diff --git a/src/views/_ibs/Settings/Network/Network.vue b/src/views/_ibs/Settings/Network/Network.vue
index d21ce2ec..4229f82c 100644
--- a/src/views/_ibs/Settings/Network/Network.vue
+++ b/src/views/_ibs/Settings/Network/Network.vue
@@ -42,7 +42,9 @@
<script>
import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin';
import DataFormatterMixin from '@/components/_ibs/Mixins/DataFormatterMixin';
-import LoadingBarMixin, { loading } from '@/components/_ibs/Mixins/LoadingBarMixin';
+import LoadingBarMixin, {
+ loading,
+} from '@/components/_ibs/Mixins/LoadingBarMixin';
import ModalMacAddress from './ModalMacAddress.vue';
import ModalHostname from './ModalHostname.vue';
import ModalIpv4 from './ModalIpv4.vue';