github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-08-28 11:24:25 +00:00
Code Issues Projects Releases Wiki Activity

merge: with dev

Browse Source
This commit is contained in:
ibuler 2020-06-02 16:13:29 +08:00
commit c4c64c1e90
12 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
src/i18n/langs/en.json
View File

@ -348,83 +348,82 @@
"": ""
},
"route": {
"": "",
"AdminUserCreate": "Admin user create",
"AdminUserDetail": "",
"AdminUserDetail": "Admin user detail",
"AdminUserList": "Admin users",
"AdminUserUpdate": "",
"AdminUserUpdate": "Admin user update",
"Applications": "Applications",
"AssetCreate": "",
"AssetDetail": "",
"AssetCreate": "Asset create",
"AssetDetail": "Asset detail",
"AssetList": "Assets",
"AssetPermission": "Asset permissions",
"AssetPermissionCreate": "Asset permissions create",
"AssetPermissionDetail": "Asset permissions detail",
"AssetPermissionUpdate": "Asset permissions update",
"AssetUpdate": "",
"AssetUpdate": "Asset update",
"Assets": "Assets",
"Audits": "Audits",
"BatchCommand": "Batch command",
"CeleryTaskLog": "",
"CommandExecutions": "",
"CommandFilterCreate": "\\u521b\\u5efa\\u547d\\u4ee4\\u8fc7\\u6ee4\\u5668",
"CommandFilterDetail": "",
"CeleryTaskLog": "Celery task log",
"CommandExecutions": "CommandExecutions ",
"CommandFilterCreate": "Command filter create",
"CommandFilterDetail": "Command filter detail",
"CommandFilterList": "Command filters",
"CommandFilterRulesCreate": " \\u521b\\u5efa\\u547d\\u4ee4\\u8fc7\\u6ee4\\u5668\\u89c4\\u5219",
"CommandFilterRulesUpdate": "",
"CommandFilterUpdate": "\\u66f4\\u65b0\\u547d\\u4ee4\\u8fc7\\u6ee4\\u5668",
"CommandFilterRulesCreate": "Command filter rules create",
"CommandFilterRulesUpdate": "Command filter rules update",
"CommandFilterUpdate": "Command filter update",
"CommandStorageUpdate": "Command storage update",
"Commands": "Commands",
"CreateCommandStorage": "Create command storage",
"CreateReplayStorage": "Create replay storage",
"Dashboard": "Dashboard",
"DatabaseApp": "Database apps",
"DatabaseAppCreate": "",
"DatabaseAppCreate": "Database app create",
"DatabaseAppDetail": "Database app detail",
"DatabaseAppPermission": "Databases permissions",
"DatabaseAppPermissionCreate": "Databases permissions create",
"DatabaseAppPermissionDetail": "Databases permissions detail",
"DatabaseAppPermissionUpdate": "Databases permissions update",
"DatabaseAppUpdate": "",
"DomainCreate": "",
"DomainDetail": "",
"DatabaseAppUpdate": "Database app update",
"DomainCreate": "Domain create",
"DomainDetail": "Domain detail",
"DomainList": "Domains",
"DomainUpdate": "",
"DomainUpdate": "Domain update",
"FileManager": "File manager",
"FtpLog": "FTP logs",
"GatewayCreate": "",
"GatewayUpdate": "",
"GatewayCreate": "Gateway create",
"GatewayUpdate": "Gateway update",
"JobCenter": "Job center",
"LabelCreate": "\\u521b\\u5efa\\u6807\\u7b7e",
"LabelCreate": "Label create",
"LabelList": "Labels",
"LabelUpdate": "\\u66f4\\u65b0\\u6807\\u7b7e",
"LabelUpdate": "Label update",
"LoginLog": "Login logs",
"MyApps": "",
"MyAssets": "",
"MyApps": "My apps",
"MyAssets": "My assets",
"OperateLog": "Operation logs",
"PasswordChangeLog": "Password update logs",
"Perms": "Permissions",
"PlatformCreate": "\\u521b\\u5efa\\u7cfb\\u7edf\\u5e73\\u53f0",
"PlatformDetail": "",
"PlatformCreate": "Platform create",
"PlatformDetail": "Platform detail",
"PlatformList": "Platforms",
"PlatformUpdate": "\\u66f4\\u65b0\\u7cfb\\u7edf\\u5e73\\u53f0",
"PlatformUpdate": "Platform update",
"RemoteApp": "Remote apps",
"RemoteAppDetail": "Remote app detail",
"RemoteAppPermission": "Remote apps permissions",
"RemoteAppPermissionCreate": "Remote apps permission create",
"RemoteAppPermissionDetail": "Remote apps permissions detail",
"RemoteAppPermissionUpdate": "Remote app permission update",
"RemoteAppUpdate": "",
"RemoteAppUpdate": "Remote app update",
"ReplayStorageUpdate": "Replay storage update",
"SessionDetail": "Sessions detail",
"SessionOffline": "Sessions offline",
"SessionOnline": "Sessions online",
"Sessions": "Sessions",
"Settings": "Settings",
"SystemUserCreate": "\\u521b\\u5efa\\u7cfb\\u7edf\\u7528\\u6237",
"SystemUserDetail": "\\u7cfb\\u7edf\\u7528\\u6237\\u8be6\\u60c5",
"SystemUserCreate": "System user create",
"SystemUserDetail": "System user detail",
"SystemUserList": "System users",
"SystemUserUpdate": "\\u66f4\\u65b0\\u7cfb\\u7edf\\u7528\\u6237",
"SystemUserUpdate": "System user update",
"TaskDetail": "Tasks detail",
"TaskList": "Tasks",
"Terminal": "Terminal",
@ -435,12 +434,12 @@
"UserGroupCreate": "User group create",
"UserGroupDetail": "User group detail",
"UserGroupList": "User groups",
"UserGroupUpdate": "",
"UserGroupUpdate": "User group update",
"UserList": "Users",
"UserProfile": "",
"UserProfile": "User profile",
"UserUpdate": "User update",
"Users": "Users",
"WebFTP": "",
"WebFTP": "WebFTP",
"WebTerminal": "Web terminal",
"BatchCommandLog": "Batch command log"
},

2
src/userviews/users/UserProfile/SSHUpdate.vue
View File

@ -55,7 +55,7 @@ export default {
{
title: this.$t('users.ResetAndDownloadSSHKey'),
callback: function() {
window.open(`/users/profile/pubkey/generate/`, '_blank')
window.open(`/core/users/profile/pubkey/generate/`, '_blank')
}
}
]

4
src/views/assets/AdminUser/AdminUserDetail/AssetsList.vue
View File

@ -67,7 +67,7 @@ export default {
this.$axios.get(
`api/v1/assets/admin-users/${this.object.id}/connective/`
).then(res => {
window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
}
)
}.bind(this)
@ -123,7 +123,7 @@ export default {
`api/v1/assets/asset-users/tasks/?id=${val.cellValue}`,
{ action: 'test' }
).then(res => {
window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
})
}
},

2
src/views/assets/Asset/AssetDetail/AssetList.vue
View File

@ -42,7 +42,7 @@ export default {
{ action: 'test' }
).then(res => {
console.log(`/ops/celery/task/${res.task}/log/`)
window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
}
)
}.bind(this)

4
src/views/assets/Asset/AssetDetail/Detail.vue
View File

@ -64,7 +64,7 @@ export default {
`/api/v1/assets/assets/${this.object.id}/tasks/`,
{ action: 'refresh' }
).then(res => {
window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
}
)
}.bind(this)
@ -82,7 +82,7 @@ export default {
`/api/v1/assets/assets/${this.object.id}/tasks/`,
{ action: 'test' }
).then(res => {
window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
}
)
}.bind(this)

4
src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
View File

@ -110,7 +110,7 @@ export default {
`api/v1/assets/system-users/${this.object.id}/tasks/`,
{ action: 'test' }
).then(res => {
window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
}
)
}.bind(this)
@ -166,7 +166,7 @@ export default {
`api/v1/assets/asset-users/tasks/?id=${val.cellValue}`,
{ action: 'test' }
).then(res => {
window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
})
}
},

2
src/views/assets/SystemUser/SystemUserList.vue
View File

@ -64,7 +64,7 @@ export default {
]
},
headerActions: {
// hasBulkDelete: false,
hasBulkDelete: false,
hasMoreActions: false,
createRoute: 'SystemUserCreate'
},

2
src/views/audits/FTPLogList.vue
View File

@ -19,7 +19,7 @@ export default {
],
columnsMeta: {
remote_addr: {
width: '130px'
width: '140px'
},
operate: {
width: '90px'

3
src/views/audits/LoginLogList.vue
View File

@ -39,9 +39,8 @@ export default {
},
headerActions: {
hasLeftActions: false,
hasDatePicker: true,
hasImport: false,
hasRefresh: false
hasDatePicker: true
}
}
}

2
src/views/ops/TaskDetail/HistoryExecutionDetail/HistoryExecutionDetail.vue
View File

@ -43,7 +43,7 @@ export default {
callbacks: {
click: function() {
const taskId = vm.object.id
window.open(`/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600')
window.open(`/core/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600')
}
}
}

2
src/views/ops/TaskDetail/TaskDetail.vue
View File

@ -43,7 +43,7 @@ export default {
callbacks: {
click: function() {
const taskId = vm.object.latest_execution.id
window.open(`/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600')
window.open(`/core/ops/celery/task/${taskId}/log/`, '', 'width=900,height=600')
}
}
}

2
src/views/ops/TaskList.vue
View File

@ -72,7 +72,7 @@ export default {
this.$axios.get(
`/api/v1/ops/tasks/${cellValue}/run/`
).then(res => {
window.open(`/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
window.open(`/core/ops/celery/task/${res.task}/log/`, '', 'width=900,height=600')
})
}
}