diff --git a/src/components/AccountCreateUpdateForm/index.vue b/src/components/AccountCreateUpdateForm/index.vue index 836cae0ea..e5b3dfe88 100644 --- a/src/components/AccountCreateUpdateForm/index.vue +++ b/src/components/AccountCreateUpdateForm/index.vue @@ -29,7 +29,7 @@ export default { loading: true, usernameChanged: false, url: '/api/v1/assets/accounts/', - form: this.account || { }, + form: this.account || {}, fields: [ [this.$t('common.Basic'), ['name', 'username', 'privileged']], [this.$t('assets.Secret'), ['secret_type', 'secret', 'ssh_key', 'token', 'api_key', 'passphrase']], @@ -121,6 +121,11 @@ export default { }) }, confirm(form) { + const secretType = form.secret_type || '' + if (secretType !== 'password') { + form.secret = form[secretType] + delete form[secretType] + } if (this.account?.name) { this.$emit('edit', form) } else { diff --git a/src/components/AccountListTable/AddAccount.vue b/src/components/AccountListTable/AccountCreateUpdate.vue similarity index 100% rename from src/components/AccountListTable/AddAccount.vue rename to src/components/AccountListTable/AccountCreateUpdate.vue diff --git a/src/components/AccountListTable/index.vue b/src/components/AccountListTable/index.vue index 71cf48eb3..dd236016f 100644 --- a/src/components/AccountListTable/index.vue +++ b/src/components/AccountListTable/index.vue @@ -8,7 +8,7 @@ :account="account" @updateAuthDone="onUpdateAuthDone" /> - + + + + + + diff --git a/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue b/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue index 4919e3a2d..958389aff 100644 --- a/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue +++ b/src/views/perms/AssetPermission/AssetPermissionDetail/index.vue @@ -11,6 +11,7 @@ import { GenericDetailPage, TabPage } from '@/layout/components' import AssetPermissionDetail from './AssetPermissionDetail' import AssetPermissionUser from './AssetPermissionUser' import AssetPermissionAsset from './AssetPermissionAsset' +import AssetPermissionAccount from './AssetPermissionAccount' export default { components: { @@ -18,6 +19,7 @@ export default { AssetPermissionDetail, AssetPermissionUser, AssetPermissionAsset, + AssetPermissionAccount, TabPage }, data() { @@ -42,6 +44,11 @@ export default { title: this.$t('perms.assetAndNode'), name: 'AssetPermissionAsset', hidden: () => !this.$hasPerm('assets.view_asset') || !this.$hasPerm('perms.change_assetpermission') + }, + { + title: this.$t('perms.permAccount'), + name: 'AssetPermissionAccount', + hidden: () => !this.$hasPerm('assets.view_account') || !this.$hasPerm('perms.change_assetpermission') } ] }