llvy.ltd/casdoor
1
0
Fork 0
mirror of https://github.com/casdoor/casdoor.git synced 2025-05-23 02:35:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug in first name, last name checking

Browse Source
This commit is contained in:
Gucheng Wang 2022-02-28 13:17:05 +08:00
parent e19f07c521
commit c14bf9fdab
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
controllers/account.go
View File

@ -172,9 +172,11 @@ func (c *ApiController) Signup() {
} }
if application.GetSignupItemRule("Display name") == "First, last" { if application.GetSignupItemRule("Display name") == "First, last" {
user.DisplayName = fmt.Sprintf("%s %s", form.FirstName, form.LastName) if form.FirstName != "" || form.LastName != "" {
user.FirstName = form.FirstName user.DisplayName = fmt.Sprintf("%s %s", form.FirstName, form.LastName)
user.LastName = form.LastName user.FirstName = form.FirstName
user.LastName = form.LastName
}
} }
affected := object.AddUser(user) affected := object.AddUser(user)

2
object/check.go
View File

@ -85,7 +85,7 @@ func CheckUserSignup(application *Application, organization *Organization, usern
} }
if application.IsSignupItemVisible("Display name") { if application.IsSignupItemVisible("Display name") {
if application.GetSignupItemRule("Display name") == "First, last" { if application.GetSignupItemRule("Display name") == "First, last" && (firstName != "" || lastName != "") {
if firstName == "" { if firstName == "" {
return "firstName cannot be blank" return "firstName cannot be blank"
} else if lastName == "" { } else if lastName == "" {