Merge pull request #1885 from ywk253100/170330_fix

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

View File

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

View File

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