diff options
author | Gunnar Mills <gmills@us.ibm.com> | 2020-01-29 05:16:44 +0300 |
---|---|---|
committer | Gunnar Mills <gmills@us.ibm.com> | 2020-01-29 05:17:48 +0300 |
commit | ff4ab407dac4b5652bf8b7a096894ba461a6cf6a (patch) | |
tree | 7d7e9f96d1f2e41a702792c3268b81629f3021be /src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue | |
parent | 5fa09a25c207d13ec1c9a8df92fc058f15a872e1 (diff) | |
download | webui-vue-ff4ab407dac4b5652bf8b7a096894ba461a6cf6a.tar.xz |
Revert "Update local user layout and styles"
Merged accidentally. Did not have proper +1s/+2s. The author
will resubmit. Apologies for the noise.
This reverts commit 5fa09a25c207d13ec1c9a8df92fc058f15a872e1.
Change-Id: I59a792193f94f51c6f499c385305db919cf43927
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>
Diffstat (limited to 'src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue')
-rw-r--r-- | src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue | 47 |
1 files changed, 17 insertions, 30 deletions
diff --git a/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue b/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue index 0ca3428d..b016dcc6 100644 --- a/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue +++ b/src/views/AccessControl/LocalUserManagement/LocalUserManagement.vue @@ -2,7 +2,7 @@ <b-container class="ml-0"> <page-title /> <b-row> - <b-col lg="10" class="text-right"> + <b-col lg="10"> <b-button variant="link" @click="initModalSettings"> Account policy settings <icon-settings /> @@ -15,11 +15,11 @@ </b-row> <b-row> <b-col lg="10"> - <b-table show-empty :fields="fields" :items="tableItems"> + <b-table bordered show-empty head-variant="dark" :items="tableItems"> + <template v-slot:head(actions)="data"></template> <template v-slot:cell(actions)="data"> <b-button aria-label="Edit user" - title="Edit user" variant="link" :disabled="!data.value.edit" @click="initModalUser(data.item)" @@ -28,7 +28,6 @@ </b-button> <b-button aria-label="Delete user" - title="Delete user" variant="link" :disabled="!data.value.delete" @click="initModalDelete(data.item)" @@ -43,7 +42,6 @@ <b-col lg="8"> <b-button v-b-toggle.collapse-role-table variant="link" class="mt-3"> View privilege role descriptions - <icon-chevron /> </b-button> <b-collapse id="collapse-role-table" class="mt-3"> <table-roles /> @@ -52,7 +50,11 @@ </b-row> <!-- Modals --> <modal-settings :settings="settings"></modal-settings> - <modal-user :user="activeUser" @ok="saveUser"></modal-user> + <modal-user + :user="activeUser" + @ok="saveUser" + @hidden="clearActiveUser" + ></modal-user> </b-container> </template> @@ -61,7 +63,6 @@ import IconTrashcan from '@carbon/icons-vue/es/trash-can/20'; import IconEdit from '@carbon/icons-vue/es/edit/20'; import IconAdd from '@carbon/icons-vue/es/add--alt/20'; import IconSettings from '@carbon/icons-vue/es/settings/20'; -import IconChevron from '@carbon/icons-vue/es/chevron--up/20'; import TableRoles from './TableRoles'; import ModalUser from './ModalUser'; @@ -72,7 +73,6 @@ export default { name: 'LocalUsers', components: { IconAdd, - IconChevron, IconEdit, IconSettings, IconTrashcan, @@ -84,17 +84,7 @@ export default { data() { return { activeUser: null, - settings: null, - fields: [ - 'username', - 'privilege', - 'status', - { - key: 'actions', - label: '', - tdClass: 'table-cell__actions' - } - ] + settings: null }; }, computed: { @@ -115,8 +105,7 @@ export default { actions: { edit: true, delete: user.UserName === 'root' ? false : true - }, - ...user + } }; }); } @@ -154,15 +143,18 @@ export default { // fetch settings then show modal } }, - saveUser({ isNewUser, userData }) { - if (isNewUser) { - this.$store.dispatch('localUsers/createUser', userData); + saveUser({ newUser, form }) { + if (newUser) { + this.$store.dispatch('localUsers/createUser', form); } else { - this.$store.dispatch('localUsers/updateUser', userData); + this.$store.dispatch('localUsers/updateUser', form); } }, deleteUser({ username }) { this.$store.dispatch('localUsers/deleteUser', username); + }, + clearActiveUser() { + this.activeUser = null; } } }; @@ -172,9 +164,4 @@ export default { h1 { margin-bottom: 2rem; } -.btn.collapsed { - svg { - transform: rotate(180deg); - } -} </style> |