mirror of
https://github.com/jumpserver/lina.git
synced 2025-11-18 05:49:14 +00:00
Compare commits
2 Commits
pr@dev@k8s
...
v2.10.2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6f65bcf2d5 | ||
|
|
8a97928d1d |
@@ -207,7 +207,7 @@ export default {
|
|||||||
if (!d) {
|
if (!d) {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
if (!itemColData || !itemColData.length) {
|
if (typeof itemColData !== 'number' && (!itemColData || !itemColData.length)) {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
return itemColData.length
|
return itemColData.length
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ export default {
|
|||||||
password: {
|
password: {
|
||||||
component: UserPassword,
|
component: UserPassword,
|
||||||
hidden: (formValue) => {
|
hidden: (formValue) => {
|
||||||
if (formValue.password_strategy) {
|
if (formValue.password_strategy === 'custom') {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return !formValue.update_password
|
return !formValue.update_password
|
||||||
@@ -81,7 +81,7 @@ export default {
|
|||||||
}
|
}
|
||||||
],
|
],
|
||||||
hidden: (formValue) => {
|
hidden: (formValue) => {
|
||||||
if (formValue.password_strategy) {
|
if (formValue.password_strategy === 'custom') {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
return !formValue.update_password || !this.user.can_public_key_auth
|
return !formValue.update_password || !this.user.can_public_key_auth
|
||||||
@@ -148,7 +148,7 @@ export default {
|
|||||||
methods: {
|
methods: {
|
||||||
cleanFormValue(value) {
|
cleanFormValue(value) {
|
||||||
const method = this.getMethod()
|
const method = this.getMethod()
|
||||||
if (method === 'post' && !value.password_strategy) {
|
if (method === 'post' && value.password_strategy === 'email') {
|
||||||
delete value['password']
|
delete value['password']
|
||||||
if (this.currentOrgIsRoot) {
|
if (this.currentOrgIsRoot) {
|
||||||
delete value['groups']
|
delete value['groups']
|
||||||
|
|||||||
Reference in New Issue
Block a user