ACCESS_MODE_* -> AccessMode*
This commit is contained in:
parent
0b62aeb495
commit
f388661bda
15 changed files with 59 additions and 59 deletions
|
@ -63,7 +63,7 @@ func repoAssignment() macaron.Handler {
|
|||
}
|
||||
|
||||
if ctx.IsSigned && ctx.User.IsAdmin {
|
||||
ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER
|
||||
ctx.Repo.AccessMode = models.AccessModeOwner
|
||||
} else {
|
||||
mode, err := models.AccessLevel(ctx.User, repo)
|
||||
if err != nil {
|
||||
|
|
|
@ -99,8 +99,8 @@ func ListMyRepos(ctx *context.APIContext) {
|
|||
|
||||
for repo, access := range accessibleRepos {
|
||||
repos[i] = repo.APIFormat(&api.Permission{
|
||||
Admin: access >= models.ACCESS_MODE_ADMIN,
|
||||
Push: access >= models.ACCESS_MODE_WRITE,
|
||||
Admin: access >= models.AccessModeAdmin,
|
||||
Push: access >= models.AccessModeWrite,
|
||||
Pull: true,
|
||||
})
|
||||
i++
|
||||
|
|
|
@ -226,11 +226,11 @@ func EditTeamPost(ctx *context.Context, form auth.CreateTeamForm) {
|
|||
var auth models.AccessMode
|
||||
switch form.Permission {
|
||||
case "read":
|
||||
auth = models.ACCESS_MODE_READ
|
||||
auth = models.AccessModeRead
|
||||
case "write":
|
||||
auth = models.ACCESS_MODE_WRITE
|
||||
auth = models.AccessModeWrite
|
||||
case "admin":
|
||||
auth = models.ACCESS_MODE_ADMIN
|
||||
auth = models.AccessModeAdmin
|
||||
default:
|
||||
ctx.Error(401)
|
||||
return
|
||||
|
|
|
@ -133,9 +133,9 @@ func HTTP(ctx *context.Context) {
|
|||
}
|
||||
|
||||
if !isPublicPull {
|
||||
var tp = models.ACCESS_MODE_WRITE
|
||||
var tp = models.AccessModeWrite
|
||||
if isPull {
|
||||
tp = models.ACCESS_MODE_READ
|
||||
tp = models.AccessModeRead
|
||||
}
|
||||
|
||||
has, err := models.HasAccess(authUser, repo, tp)
|
||||
|
@ -143,8 +143,8 @@ func HTTP(ctx *context.Context) {
|
|||
ctx.Handle(http.StatusInternalServerError, "HasAccess", err)
|
||||
return
|
||||
} else if !has {
|
||||
if tp == models.ACCESS_MODE_READ {
|
||||
has, err = models.HasAccess(authUser, repo, models.ACCESS_MODE_WRITE)
|
||||
if tp == models.AccessModeRead {
|
||||
has, err = models.HasAccess(authUser, repo, models.AccessModeWrite)
|
||||
if err != nil {
|
||||
ctx.Handle(http.StatusInternalServerError, "HasAccess2", err)
|
||||
return
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue