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