diff options
| author | Unknwon <u@gogs.io> | 2015-08-05 20:26:00 +0800 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2015-08-05 20:26:00 +0800 |
| commit | 2c507667bfd17f88dc4bfabc426c74cd5f8e4461 (patch) | |
| tree | 31b267331f84d45a92f6a0bfe7eaafa124f4578f /routers/user/home.go | |
| parent | 0705f55ce097b9892a7c4c11faa5396c4e557232 (diff) | |
| parent | b9527cd1bfabcce3be62b43f0c199b1418519549 (diff) | |
| download | gitea-2c507667bfd17f88dc4bfabc426c74cd5f8e4461.tar.gz gitea-2c507667bfd17f88dc4bfabc426c74cd5f8e4461.zip | |
Merge branch 'develop' of github.com:gogits/gogs into feature/milestone
# Conflicts:
# gogs.go
# models/issue.go
# templates/.VERSION
Diffstat (limited to 'routers/user/home.go')
| -rw-r--r-- | routers/user/home.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/routers/user/home.go b/routers/user/home.go index 257f756174..c38dba5205 100644 --- a/routers/user/home.go +++ b/routers/user/home.go @@ -38,7 +38,7 @@ func Dashboard(ctx *middleware.Context) { // Organization. org, err := models.GetUserByName(orgName) if err != nil { - if err == models.ErrUserNotExist { + if models.IsErrUserNotExist(err) { ctx.Handle(404, "GetUserByName", err) } else { ctx.Handle(500, "GetUserByName", err) @@ -115,7 +115,7 @@ func Dashboard(ctx *middleware.Context) { // FIXME: cache results? u, err := models.GetUserByName(act.ActUserName) if err != nil { - if err == models.ErrUserNotExist { + if models.IsErrUserNotExist(err) { continue } ctx.Handle(500, "GetUserByName", err) @@ -176,7 +176,7 @@ func Profile(ctx *middleware.Context) { u, err := models.GetUserByName(uname) if err != nil { - if err == models.ErrUserNotExist { + if models.IsErrUserNotExist(err) { ctx.Handle(404, "GetUserByName", err) } else { ctx.Handle(500, "GetUserByName", err) @@ -223,7 +223,7 @@ func Profile(ctx *middleware.Context) { // FIXME: cache results? u, err := models.GetUserByName(act.ActUserName) if err != nil { - if err == models.ErrUserNotExist { + if models.IsErrUserNotExist(err) { continue } ctx.Handle(500, "GetUserByName", err) @@ -247,10 +247,10 @@ func Profile(ctx *middleware.Context) { func Email2User(ctx *middleware.Context) { u, err := models.GetUserByEmail(ctx.Query("email")) if err != nil { - if err == models.ErrUserNotExist { - ctx.Handle(404, "user.Email2User(GetUserByEmail)", err) + if models.IsErrUserNotExist(err) { + ctx.Handle(404, "GetUserByEmail", err) } else { - ctx.Handle(500, "user.Email2User(GetUserByEmail)", err) + ctx.Handle(500, "GetUserByEmail", err) } return } |