diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/auth/auth.go | 7 | ||||
| -rw-r--r-- | modules/context/org.go | 7 | ||||
| -rw-r--r-- | modules/context/repo.go | 3 |
3 files changed, 8 insertions, 9 deletions
diff --git a/modules/auth/auth.go b/modules/auth/auth.go index 2e96ec1a..6ec3afc6 100644 --- a/modules/auth/auth.go +++ b/modules/auth/auth.go @@ -14,6 +14,7 @@ import ( "gopkg.in/macaron.v1" "github.com/gogits/gogs/models" + "github.com/gogits/gogs/models/errors" "github.com/gogits/gogs/modules/base" "github.com/gogits/gogs/modules/setting" ) @@ -65,7 +66,7 @@ func SignedInID(ctx *macaron.Context, sess session.Store) int64 { } if id, ok := uid.(int64); ok { if _, err := models.GetUserByID(id); err != nil { - if !models.IsErrUserNotExist(err) { + if !errors.IsUserNotExist(err) { log.Error(2, "GetUserById: %v", err) } return 0 @@ -90,7 +91,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (*models.User, bool) if len(webAuthUser) > 0 { u, err := models.GetUserByName(webAuthUser) if err != nil { - if !models.IsErrUserNotExist(err) { + if !errors.IsUserNotExist(err) { log.Error(4, "GetUserByName: %v", err) return nil, false } @@ -125,7 +126,7 @@ func SignedInUser(ctx *macaron.Context, sess session.Store) (*models.User, bool) u, err := models.UserSignIn(uname, passwd) if err != nil { - if !models.IsErrUserNotExist(err) { + if !errors.IsUserNotExist(err) { log.Error(4, "UserSignIn: %v", err) } return nil, false diff --git a/modules/context/org.go b/modules/context/org.go index 24ef5ef6..3cde8d63 100644 --- a/modules/context/org.go +++ b/modules/context/org.go @@ -10,6 +10,7 @@ import ( "gopkg.in/macaron.v1" "github.com/gogits/gogs/models" + "github.com/gogits/gogs/models/errors" "github.com/gogits/gogs/modules/setting" ) @@ -49,11 +50,7 @@ func HandleOrgAssignment(ctx *Context, args ...bool) { var err error ctx.Org.Organization, err = models.GetUserByName(orgName) if err != nil { - if models.IsErrUserNotExist(err) { - ctx.Handle(404, "GetUserByName", err) - } else { - ctx.Handle(500, "GetUserByName", err) - } + ctx.NotFoundOrServerError("GetUserByName", errors.IsUserNotExist, err) return } org := ctx.Org.Organization diff --git a/modules/context/repo.go b/modules/context/repo.go index 6a2911a7..209ea1e3 100644 --- a/modules/context/repo.go +++ b/modules/context/repo.go @@ -18,6 +18,7 @@ import ( "github.com/gogits/git-module" "github.com/gogits/gogs/models" + "github.com/gogits/gogs/models/errors" "github.com/gogits/gogs/modules/setting" ) @@ -169,7 +170,7 @@ func RepoAssignment(args ...bool) macaron.Handler { } else { owner, err = models.GetUserByName(ownerName) if err != nil { - if models.IsErrUserNotExist(err) { + if errors.IsUserNotExist(err) { if ctx.Query("go-get") == "1" { earlyResponseForGoGetMeta(ctx) return |