diff --git a/src/components/Apps/AccountListTable/AccountList.vue b/src/components/Apps/AccountListTable/AccountList.vue index 9e4826ea6..bf1184a3b 100644 --- a/src/components/Apps/AccountListTable/AccountList.vue +++ b/src/components/Apps/AccountListTable/AccountList.vue @@ -258,7 +258,7 @@ export default { title: this.$t('Test'), can: ({ row }) => !this.$store.getters.currentOrgIsRoot && - this.$hasPerm('accounts.change_account') && + this.$hasPerm('accounts.verify_account') && row.asset['auto_config'].ansible_enabled && row.asset['auto_config'].ping_enabled, callback: ({ row }) => { diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue index 2ad75f5f7..0ac24a09a 100644 --- a/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue +++ b/src/views/accounts/AccountBackup/AccountBackupDetail/AccountBackupExecution/AccountBackupExecutionDetail/AccountBackupExecutionInfo.vue @@ -21,6 +21,7 @@ export default { } }, data() { + this.isEmail = this.object.snapshot.backup_type === 'email' return { url: `/api/v1/accounts/account-backup-plan-executions/${this.object.id}/`, detailFields: [ @@ -31,9 +32,36 @@ export default { }, 'date_start', 'is_success', 'reason', { - key: this.$t('MailRecipient'), - value: this.object.recipients ? this.object.recipients.map( - i => `${i[0]}` + `${i[1] ? ': ' + this.$t('ContainAttachment') : ''}`).join(', ') : '' + key: this.$t('Recipient') + ' A', + value: this.object.snapshot.recipients_part_one, + formatter: (item, val) => { + const recipientA = this.isEmail ? Object.values(val).map(item => item[0].split('(')[0]).join(', ') : '-' + return {recipientA} + } + }, + { + key: this.$t('Recipient') + ' B', + value: this.object.snapshot.recipients_part_two, + formatter: (item, val) => { + const recipientB = this.isEmail ? Object.values(val).map(item => item[0].split('(')[0]).join(', ') : '-' + return {recipientB} + } + }, + { + key: this.$t('RecipientServer') + ' A', + value: this.object.snapshot.obj_recipients_part_one, + formatter: (item, val) => { + const recipientServerA = this.isEmail ? Object.values(val).map(item => item[0]).join(', ') : '-' + return {recipientServerA} + } + }, + { + key: this.$t('RecipientServer') + ' B', + value: this.object.snapshot.obj_recipients_part_two, + formatter: (item, val) => { + const recipientServerB = this.isEmail ? Object.values(val).map(item => item[0]).join(', ') : '-' + return {recipientServerB} + } } ] }