work on #754

diff --git a/models/user.go b/models/user.go
index 7e6a6c824f6448bdb0886aa2b3121bba78815118..729f2c0c7e222cb86468bc54b3c1b4b9f832b069 100644 (file)
--- a/models/user.go
+++ b/models/user.go
@@ -418,7 +418,7 @@ func ChangeUserName(u *User, newUserName string) (err error) {
 
 // UpdateUser updates user's information.
 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 {
                return err
        } else if has {

diff --git a/routers/user/home.go b/routers/user/home.go
index f5f6ab9422d17e12c1ae37723cc209bebbe0fa0a..0de551715aa37b64bc2648176fa3feb9f124efc5 100644 (file)
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -105,6 +105,9 @@ func Dashboard(ctx *middleware.Context) {
                // FIXME: cache results?
                u, err := models.GetUserByName(act.ActUserName)
                if err != nil {
+                       if err == models.ErrUserNotExist {
+                               continue
+                       }
                        ctx.Handle(500, "GetUserByName", err)
                        return
                }