Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-05 18:20:37 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1885 from ywk253100/170330_fix

Browse Source 
Shorten comment message of user registered from LDAP
This commit is contained in:
Daniel Jiang 2017-03-30 19:14:47 +08:00 committed by GitHub
commit 53a19674bf
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/utils/ldap/ldap.go
View File

@ -300,7 +300,7 @@ func ImportUser(user models.LdapUser) (int64, error) {
} }
u.Password = "12345678AbC" u.Password = "12345678AbC"
u.Comment = "registered from LDAP." u.Comment = "from LDAP."
if u.Email == "" { if u.Email == "" {
u.Email = u.Username + "@placeholder.com" u.Email = u.Username + "@placeholder.com"
} }

2
src/ui/auth/ldap/ldap.go
View File

@ -89,7 +89,7 @@ func (l *Auth) Authenticate(m models.AuthModel) (*models.User, error) {
u.UserID = currentUser.UserID u.UserID = currentUser.UserID
} else { } else {
// u.Password = "12345678AbC" // u.Password = "12345678AbC"
// u.Comment = "registered from LDAP." // u.Comment = "from LDAP."
// if u.Email == "" { // if u.Email == "" {
// u.Email = u.Username + "@placeholder.com" // u.Email = u.Username + "@placeholder.com"
// } // }