diff --git a/src/router/pam/activity.js b/src/router/pam/activity.js index 705c0f292..1c6611faf 100644 --- a/src/router/pam/activity.js +++ b/src/router/pam/activity.js @@ -20,7 +20,7 @@ export default [ component: () => import('@/views/sessions/SessionList/index.vue'), name: 'AccountSessionList', meta: { - title: i18n.t('AccountSessions'), + title: i18n.t('SessionList'), permissions: [] } } @@ -45,7 +45,7 @@ export default [ component: () => import('@/views/accounts/AccountActivity/AccountActivityList.vue'), name: 'AccountActivityList', meta: { - title: i18n.t('AccountActivity'), + title: i18n.t('Activity'), permissions: ['audits.view_operatelog'] } } diff --git a/src/router/pam/automations.js b/src/router/pam/automations.js index 6c42d6bdb..0ee15754a 100644 --- a/src/router/pam/automations.js +++ b/src/router/pam/automations.js @@ -113,7 +113,7 @@ export default [ name: 'AccountChangeSecretList', meta: { menuTitle: i18n.t('ChangeSecret'), - title: i18n.t('AccountChangeSecret'), + title: i18n.t('ChangeSecret'), permissions: ['accounts.view_changesecretautomation'] } }, @@ -143,7 +143,7 @@ export default [ name: 'AccountChangeSecretDetail', hidden: true, meta: { - title: i18n.t('AccountChangeSecret'), + title: i18n.t('ChangeSecret'), permissions: ['accounts.view_changesecretautomation'] } }, @@ -296,8 +296,7 @@ export default [ component: () => import('@/views/accounts/AccountBackup/AccountBackupDetail/index.vue'), name: 'AccountBackupDetail', meta: { - title: i18n.t('AccountBackupDetail'), - activeMenu: '/console/accounts/automations' + title: i18n.t('AccountBackupDetail') }, hidden: true }, diff --git a/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue b/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue index f8229d7f7..14e7a92c6 100644 --- a/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue +++ b/src/views/accounts/AccountBackup/AccountBackupDetail/index.vue @@ -20,18 +20,14 @@ export default { return { plan: { name: '', comment: '' }, config: { - url: `/api/v1/accounts/account-backup-plans/`, + url: `/api/v1/accounts/account-backup-plans`, activeMenu: 'AccountBackupInfo', submenu: [ { title: this.$t('Basic'), name: 'AccountBackupInfo' } - ], - actions: { - detailApiUrl: `/api/v1/accounts/account-backup-plans/`, - deleteSuccessRoute: 'AccountBackupList' - } + ] } } } diff --git a/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue b/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue index fae3ead87..5457187b0 100644 --- a/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue +++ b/src/views/accounts/AccountBackup/AccountBackupExecution/AccountBackupExecutionList.vue @@ -24,17 +24,30 @@ export default { tableConfig: { url: '/api/v1/accounts/account-backup-plan-executions/', columns: [ - 'automation', 'trigger', + 'automation', 'backup_name', 'trigger', 'date_start', 'date_finished', 'duration', 'actions' ], columnsShow: { default: [ - 'automation', 'trigger', + 'automation', 'backup_name', 'trigger', 'date_start', 'date_finished', 'duration', 'actions' ] }, columnsMeta: { automation: { + label: this.$t('ID'), + formatter: DetailFormatter, + formatterArgs: { + route: 'AccountBackupExecutionDetail', + getRoute: ({ row }) => ({ + name: 'AccountBackupExecutionDetail', + params: { id: row.id } + }), + drawer: true, + can: this.$hasPerm('accounts.view_backupaccountexecution') + } + }, + backup_name: { label: this.$t('DisplayName'), formatter: DetailFormatter, formatterArgs: { @@ -67,15 +80,6 @@ export default { openTaskPage(row['id']) } }, - { - name: 'detail', - title: this.$t('Detail'), - type: 'info', - can: this.$hasPerm('accounts.view_backupaccountexecution'), - callback: function({ row }) { - return this.$router.push({ name: 'AccountBackupExecutionDetail', params: { id: row.id }}) - } - }, { name: 'report', title: this.$t('Report'), diff --git a/src/views/accounts/AccountBackup/AccountBackupList.vue b/src/views/accounts/AccountBackup/AccountBackupList.vue index 3baa65cfd..2b4f41828 100644 --- a/src/views/accounts/AccountBackup/AccountBackupList.vue +++ b/src/views/accounts/AccountBackup/AccountBackupList.vue @@ -8,9 +8,9 @@