summaryrefslogtreecommitdiffstats
path: root/modules/middleware/repo.go
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2015-02-13 00:58:46 -0500
committerUnknwon <joe2010xtmf@163.com>2015-02-13 00:58:46 -0500
commit6d0f3a07d4fa3189b0b7c4e366bddb6d72ef7e68 (patch)
tree02b1617a75095fe5f072533708e920fbac477d34 /modules/middleware/repo.go
parentb99c4baab22ec080906582703809e5ec12bae3f9 (diff)
downloadgitea-6d0f3a07d4fa3189b0b7c4e366bddb6d72ef7e68.tar.gz
gitea-6d0f3a07d4fa3189b0b7c4e366bddb6d72ef7e68.zip
code fix #941 caution: undertest
Diffstat (limited to 'modules/middleware/repo.go')
-rw-r--r--modules/middleware/repo.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 8465af83ef..ea41b0dddd 100644
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -28,7 +28,7 @@ func ApiRepoAssignment() macaron.Handler {
err error
)
- // Check if the user is the same as the repository owner
+ // Check if the user is the same as the repository owner.
if ctx.IsSigned && u.LowerName == strings.ToLower(userName) {
u = ctx.User
} else {
@@ -216,9 +216,9 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
u, err = models.GetUserByName(userName)
if err != nil {
if err == models.ErrUserNotExist {
- ctx.Error(404)
+ ctx.Handle(404, "GetUserByName", err)
} else {
- ctx.JSON(500, &base.ApiJsonErr{"GetUserByName: " + err.Error(), base.DOC_URL})
+ ctx.Handle(500, "GetUserByName", err)
}
return
}
@@ -229,20 +229,20 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
repo, err := models.GetRepositoryByName(u.Id, repoName)
if err != nil {
if err == models.ErrRepoNotExist {
- ctx.Error(404)
+ ctx.Handle(404, "GetRepositoryByName", err)
} else {
- ctx.JSON(500, &base.ApiJsonErr{"GetRepositoryByName: " + err.Error(), base.DOC_URL})
+ ctx.Handle(500, "GetRepositoryByName", err)
}
return
} else if err = repo.GetOwner(); err != nil {
- ctx.JSON(500, &base.ApiJsonErr{"GetOwner: " + err.Error(), base.DOC_URL})
+ ctx.Handle(500, "GetOwner", err)
return
}
if ctx.IsSigned {
mode, err := models.AccessLevel(ctx.User, repo)
if err != nil {
- ctx.JSON(500, &base.ApiJsonErr{"AccessLevel: " + err.Error(), base.DOC_URL})
+ ctx.Handle(500, "AccessLevel", err)
return
}
ctx.Repo.IsOwner = mode >= models.ACCESS_MODE_WRITE
@@ -252,7 +252,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
// Check access.
if repo.IsPrivate && !ctx.Repo.IsOwner {
- ctx.Error(404)
+ ctx.Handle(404, "no access right", err)
return
}
ctx.Repo.HasAccess = true