diff --git a/src/components/AccountListTable/AccountList.vue b/src/components/AccountListTable/AccountList.vue index 70495c612..bc09f82b2 100644 --- a/src/components/AccountListTable/AccountList.vue +++ b/src/components/AccountListTable/AccountList.vue @@ -139,9 +139,6 @@ export default { } } }, - version: { - width: '70px' - }, secret_type: { width: '100px', formatter: function(row) { diff --git a/src/components/AccountListTable/PasswordHistoryDialog.vue b/src/components/AccountListTable/PasswordHistoryDialog.vue index 8a53f9b4a..aa8e37b49 100644 --- a/src/components/AccountListTable/PasswordHistoryDialog.vue +++ b/src/components/AccountListTable/PasswordHistoryDialog.vue @@ -28,7 +28,7 @@ export default { width: '60%', tableConfig: { url: `/api/v1/accounts/account-secrets/${this.account.id}/histories/`, - columns: ['secret', 'secret_type', 'version'], + columns: ['secret', 'secret_type', 'history_date'], columnsMeta: { secret: { formatter: ShowKeyCopyFormatter, diff --git a/src/components/AccountListTable/ViewSecret.vue b/src/components/AccountListTable/ViewSecret.vue index cbc8a9fd7..5b9609df9 100644 --- a/src/components/AccountListTable/ViewSecret.vue +++ b/src/components/AccountListTable/ViewSecret.vue @@ -2,20 +2,20 @@
- + {{ account['name'] }} @@ -45,9 +45,8 @@ type="text" @click="onShowPasswordHistory" > - {{ secretInfo.version }} + {{ historyCount }} - @@ -97,6 +96,7 @@ export default { secretInfo: {}, showSecret: false, sshKeyFingerprint: '', + historyCount: 0, showPasswordHistoryDialog: false } }, @@ -108,6 +108,12 @@ export default { return this.account['secret_type'].value } }, + mounted() { + const url = `/api/v1/accounts/account-secrets/${this.account.id}/histories/?limit=1` + this.$axios.get(url).then(resp => { + this.historyCount = resp.count + }) + }, methods: { getAuthInfo() { this.$axios.get(this.url, { disableFlashErrorMsg: true }).then(resp => { diff --git a/src/views/assets/Asset/AssetDetail/Account.vue b/src/views/assets/Asset/AssetDetail/Account.vue index e596aa3ac..ac99db165 100644 --- a/src/views/assets/Asset/AssetDetail/Account.vue +++ b/src/views/assets/Asset/AssetDetail/Account.vue @@ -48,7 +48,7 @@ export default { return { templateDialogVisible: false, columns: [ - 'name', 'username', 'version', 'privileged', 'connectivity', + 'name', 'username', 'privileged', 'connectivity', 'is_active', 'date_created', 'date_updated', 'actions' ], headerExtraActions: [