github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2026-01-13 11:24:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2723 from jumpserver/pr@dev@change_secret

Browse Source 
perf: change secret is_active
This commit is contained in:
feng626
2023-02-21 17:55:18 +08:00
committed by GitHub
parent 0929d38d3e f6125f0e75
commit 1f5670bc39
4 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/views/accounts/AccountChangeSecret/AccountChangeSecretDetail/AccountChangeSecretInfo.vue
View File

@@ -81,7 +81,7 @@ export default {
return <span>{this.object.is_periodic ? val : ''}</span>
}
},
'date_created', 'date_updated', 'comment'
'date_created', 'date_updated', 'comment', 'is_active'
]
}
},

9
src/views/accounts/AccountChangeSecret/AccountChangeSecretList.vue
View File

@@ -20,13 +20,13 @@ export default {
columnsExclude: ['password_rules'],
columns: [
'name', 'accounts', 'secret_strategy', 'is_periodic',
'periodic_display', 'executed_amount', 'actions'
'periodic_display', 'executed_amount', 'is_active', 'actions'
],
columnsShow: {
min: ['name', 'actions'],
default: [
'name', 'accounts', 'secret_strategy', 'is_periodic',
'periodic_display', 'executed_amount', 'actions'
'periodic_display', 'executed_amount', 'is_active', 'actions'
]
},
columnsMeta: {
@@ -92,8 +92,11 @@ export default {
{
title: vm.$t('xpack.Execute'),
name: 'execute',
can: this.$hasPerm('accounts.add_changesecretexection'),
can: ({ row }) => {
return row.is_active && vm.$hasPerm('accounts.add_changesecretexection')
},
type: 'info',
disabled: ({ row }) => !row.is_active,
callback: function({ row }) {
this.$axios.post(
`/api/v1/accounts/change-secret-executions/`,

2
src/views/accounts/AccountPush/AccountPushDetail/AccountPushInfo.vue
View File

@@ -81,7 +81,7 @@ export default {
return <span>{this.object.is_periodic ? val : ''}</span>
}
},
'date_created', 'date_updated', 'comment'
'date_created', 'date_updated', 'comment', 'is_active'
]
}
},

8
src/views/accounts/AccountPush/AccountPushList.vue
View File

@@ -19,13 +19,13 @@ export default {
url: '/api/v1/accounts/push-account-automations/',
columns: [
'name', 'accounts', 'secret_strategy', 'is_periodic',
'periodic_display', 'executed_amount', 'actions'
'periodic_display', 'executed_amount', 'is_active', 'actions'
],
columnsShow: {
min: ['name', 'actions'],
default: [
'name', 'accounts', 'secret_strategy', 'is_periodic',
'periodic_display', 'executed_amount', 'actions'
'periodic_display', 'executed_amount', 'is_active', 'actions'
]
},
columnsMeta: {
@@ -96,7 +96,9 @@ export default {
{
title: vm.$t('xpack.Execute'),
name: 'execute',
can: this.$hasPerm('accounts.add_pushaccountexecution'),
can: ({ row }) => {
return row.is_active && vm.$hasPerm('accounts.add_pushaccountexecution')
},
type: 'info',
callback: function({ row }) {
this.$axios.post(