test1234
/
gitea
forked from gitea/gitea
1
0
Fork 0
Code Pull Requests Activity

work on #754

This commit is contained in:
Unknwon 2014-12-18 03:26:09 -05:00
parent 57b3be4016
commit c4820f119d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
models/user.go
View File

@ -418,7 +418,7 @@ func ChangeUserName(u *User, newUserName string) (err error) {
// UpdateUser updates user's information. // UpdateUser updates user's information.
func UpdateUser(u *User) error { func UpdateUser(u *User) error {
has, err := x.Where("id != ?", u.Id).And("email = ?", u.Email).Get(new(User)) has, err := x.Where("id!=?", u.Id).And("email=?", u.Email).Get(new(User))
if err != nil { if err != nil {
return err return err
} else if has { } else if has {

3
routers/user/home.go
View File

@ -105,6 +105,9 @@ func Dashboard(ctx *middleware.Context) {
// FIXME: cache results? // FIXME: cache results?
u, err := models.GetUserByName(act.ActUserName) u, err := models.GetUserByName(act.ActUserName)
if err != nil { if err != nil {
if err == models.ErrUserNotExist {
continue
}
ctx.Handle(500, "GetUserByName", err) ctx.Handle(500, "GetUserByName", err)
return return
} }