Compare commits

...

4 Commits

Author SHA1 Message Date
feng626
f86f08f2b6 Merge pull request #1713 from jumpserver/pr@v2.21@workbench_orgs
fix: myorgs -> workbench_orgs
2022-04-25 11:36:57 +08:00
feng626
6eb429823d fix: myorgs -> workbench_orgs 2022-04-25 11:34:37 +08:00
feng626
d6be84026c Merge pull request #1711 from jumpserver/pr@v2.21@fix_temporary_password_text
fix: 修改临时密码提示文案
2022-04-25 11:05:26 +08:00
“huailei000”
4a7680ec7a fix: 修改临时密码提示文案 2022-04-25 03:00:15 +00:00
5 changed files with 7 additions and 7 deletions

View File

@@ -419,7 +419,7 @@
},
"isValid": "Is valid",
"nav": {
"TempPassword": "Temporary password",
"TempPassword": "Temporary password will expire immediately after use",
"APIKey": "API Key",
"Workbench": "Workbench",
"Navigation": "Navigation",

View File

@@ -431,7 +431,7 @@
"fileType": "ファイルタイプ",
"isValid": "有効",
"nav": {
"TempPassword": "いちじパスワード",
"TempPassword": "一時パスワード使用後すぐに無効になります",
"APIKey": "APIキー",
"Workbench": "作業台",
"Navigation": "ナビゲーション",

View File

@@ -1021,7 +1021,7 @@
"LDAPServerInfo": "LDAP 服务器",
"LDAPUser": "LDAP 用户",
"helpText": {
"TempPassword": "临时密码有效期为 300 秒,有效期内可重复使用",
"TempPassword": "临时密码有效期为 300 秒,使用后立刻失效",
"ApiKeyList": "使用api key签名请求头每个请求的头部是不一样的, 请查阅使用文档",
"authLdapSearchFilter": "可能的选项是(cn或uid或sAMAccountName=%(user)s)",
"authLdapSearchOu": "使用|分隔各OU",

View File

@@ -130,7 +130,7 @@ export default {
component: Select2,
el: {
multiple: false,
options: this.$store.state.users.profile.myorgs?.map((item) => {
options: this.$store.state.users.profile.workbench_orgs?.map((item) => {
return { label: item.name, value: item.id }
})
},
@@ -163,7 +163,7 @@ export default {
}
},
mounted() {
let userAllOrgIds = this.$store.state.users.profile['myorgs']
let userAllOrgIds = this.$store.state.users.profile['workbench_orgs']
const currentOrgId = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : null
userAllOrgIds = userAllOrgIds ? userAllOrgIds.map(i => i.id) : []
if (userAllOrgIds.length > 0) {

View File

@@ -101,7 +101,7 @@ export default {
component: Select2,
el: {
multiple: false,
options: this.$store.state.users.profile['myorgs']?.map((item) => {
options: this.$store.state.users.profile['workbench_orgs']?.map((item) => {
return { label: item.name, value: item.id }
})
},
@@ -130,7 +130,7 @@ export default {
}
},
mounted() {
let userAllOrgIds = this.$store.state.users.profile['myorgs']
let userAllOrgIds = this.$store.state.users.profile['workbench_orgs']
const currentOrgId = this.$store.getters.currentOrg ? this.$store.getters.currentOrg.id : null
userAllOrgIds = userAllOrgIds ? userAllOrgIds.map(i => i.id) : []
if (userAllOrgIds.length > 0) {