github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-20 10:46:35 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'v4' of github.com:jumpserver/lina into v4

Browse Source
This commit is contained in:
ibuler
2024-06-24 11:10:57 +08:00
parent 47c26e93df e3f5f948c3
commit 37453aaa11
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/views/ops/Job/index.vue
View File

@@ -56,6 +56,7 @@ export default {
width: '240px' width: '240px'
}, },
summary: { summary: {
label: this.$t('Summary'),
formatter: (row) => { formatter: (row) => {
return row.summary['success'] + '/' + row.summary['total'] return row.summary['success'] + '/' + row.summary['total']
} }

2
src/views/profile/PasswordAndSSHKey/SSHKey.vue
View File

@@ -64,7 +64,7 @@ export default {
}, },
methods: { methods: {
afterGetFormValue(value) { afterGetFormValue(value) {
const publicKey = `${value['public_key_comment'] || '-'} (${value['public_key_hash_md5'] || '-'})` const publicKey = value['public_key_hash_md5'] ? `${value['public_key_comment']} (${value['public_key_hash_md5']})` : ' '
value['current_public_key'] = publicKey value['current_public_key'] = publicKey
return value return value
}, },

2
src/views/settings/Applet/AppletHost/AppletHostDetail/index.vue
View File

@@ -41,7 +41,7 @@ export default {
'name': 'Detail' 'name': 'Detail'
}, },
{ {
title: this.$t('Accounts'), title: this.$t('AssetAccount'),
name: 'Accounts' name: 'Accounts'
}, },
{ {