diff options
author | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-07-07 17:46:58 +0300 |
---|---|---|
committer | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-07-07 17:46:58 +0300 |
commit | 08117f381c307ee8d45d1aefddc67cf6d93fbe7b (patch) | |
tree | 26b2c0fa0eafaaae9deacccdc42c89806ad31f92 /src/views/_ibs/SecurityAndAccess/UserManagement | |
parent | 32659fb6082d6c88e6752a6213f2867f2fbebf6c (diff) | |
parent | f34a355320e0d47629e1312c39205c08f0b11fa0 (diff) | |
download | webui-vue-08117f381c307ee8d45d1aefddc67cf6d93fbe7b.tar.xz |
Merge branch 'sila' into sila-ui
Diffstat (limited to 'src/views/_ibs/SecurityAndAccess/UserManagement')
3 files changed, 10 insertions, 10 deletions
diff --git a/src/views/_ibs/SecurityAndAccess/UserManagement/ModalSettings.vue b/src/views/_ibs/SecurityAndAccess/UserManagement/ModalSettings.vue index 0f05123c..4ba13f13 100644 --- a/src/views/_ibs/SecurityAndAccess/UserManagement/ModalSettings.vue +++ b/src/views/_ibs/SecurityAndAccess/UserManagement/ModalSettings.vue @@ -122,7 +122,7 @@ </template> <script> -import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js'; +import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js'; import { required, requiredIf, diff --git a/src/views/_ibs/SecurityAndAccess/UserManagement/ModalUser.vue b/src/views/_ibs/SecurityAndAccess/UserManagement/ModalUser.vue index 0f8757ce..823bf765 100644 --- a/src/views/_ibs/SecurityAndAccess/UserManagement/ModalUser.vue +++ b/src/views/_ibs/SecurityAndAccess/UserManagement/ModalUser.vue @@ -231,9 +231,9 @@ import { helpers, requiredIf, } from 'vuelidate/lib/validators'; -import VuelidateMixin from '@/components/Mixins/VuelidateMixin.js'; -import InputPasswordToggle from '@/components/Global/InputPasswordToggle'; -import Alert from '@/components/Global/Alert'; +import VuelidateMixin from '@/components/_ibs/Mixins/VuelidateMixin.js'; +import InputPasswordToggle from '@/components/_ibs/Global/InputPasswordToggle'; +import Alert from '@/components/_ibs/Global/Alert'; export default { components: { Alert, InputPasswordToggle }, diff --git a/src/views/_ibs/SecurityAndAccess/UserManagement/UserManagement.vue b/src/views/_ibs/SecurityAndAccess/UserManagement/UserManagement.vue index c6c556c8..623ca31f 100644 --- a/src/views/_ibs/SecurityAndAccess/UserManagement/UserManagement.vue +++ b/src/views/_ibs/SecurityAndAccess/UserManagement/UserManagement.vue @@ -121,18 +121,18 @@ import IconChevron from '@carbon/icons-vue/es/chevron--up/20'; import ModalUser from './ModalUser'; import ModalSettings from './ModalSettings'; -import PageTitle from '@/components/Global/PageTitle'; +import PageTitle from '@/components/_ibs/Global/PageTitle'; import TableRoles from './TableRoles'; -import TableToolbar from '@/components/Global/TableToolbar'; -import TableRowAction from '@/components/Global/TableRowAction'; +import TableToolbar from '@/components/_ibs/Global/TableToolbar'; +import TableRowAction from '@/components/_ibs/Global/TableRowAction'; import BVTableSelectableMixin, { selectedRows, tableHeaderCheckboxModel, tableHeaderCheckboxIndeterminate, -} from '@/components/Mixins/BVTableSelectableMixin'; -import BVToastMixin from '@/components/Mixins/BVToastMixin'; -import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin'; +} from '@/components/_ibs/Mixins/BVTableSelectableMixin'; +import BVToastMixin from '@/components/_ibs/Mixins/BVToastMixin'; +import LoadingBarMixin from '@/components/_ibs/Mixins/LoadingBarMixin'; export default { name: 'UserManagement', |