Change constants to UPPERCASE_WITH_UNDERSCORE style

diff --git a/cmd/serve.go b/cmd/serve.go
index d9d1a06b4e6325d43542fe9a61ddc731fcfebe9b..90e1045c8e26e417904376e1977a6b59bf3837b3 100644 (file)
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -59,14 +59,14 @@ func parseCmd(cmd string) (string, string) {
 
 var (
        COMMANDS_READONLY = map[string]models.AccessMode{
-               "git-upload-pack":    models.WriteAccess,
-               "git upload-pack":    models.WriteAccess,
-               "git-upload-archive": models.WriteAccess,
+               "git-upload-pack":    models.ACCESS_MODE_WRITE,
+               "git upload-pack":    models.ACCESS_MODE_WRITE,
+               "git-upload-archive": models.ACCESS_MODE_WRITE,
        }
 
        COMMANDS_WRITE = map[string]models.AccessMode{
-               "git-receive-pack": models.ReadAccess,
-               "git receive-pack": models.ReadAccess,
+               "git-receive-pack": models.ACCESS_MODE_READ,
+               "git receive-pack": models.ACCESS_MODE_READ,
        }
 )
 
@@ -141,7 +141,7 @@ func runServ(k *cli.Context) {
 
        switch {
        case isWrite:
-               has, err := models.HasAccess(user, repo, models.WriteAccess)
+               has, err := models.HasAccess(user, repo, models.ACCESS_MODE_WRITE)
                if err != nil {
                        println("Gogs: internal error:", err.Error())
                        log.GitLogger.Fatal(2, "Fail to check write access:", err)
@@ -154,7 +154,7 @@ func runServ(k *cli.Context) {
                        break
                }
 
-               has, err := models.HasAccess(user, repo, models.ReadAccess)
+               has, err := models.HasAccess(user, repo, models.ACCESS_MODE_READ)
                if err != nil {
                        println("Gogs: internal error:", err.Error())
                        log.GitLogger.Fatal(2, "Fail to check read access:", err)

diff --git a/models/access.go b/models/access.go
index ee678a0701bd93b7a78d639c1233ff7ebaf56207..916711f78681a4a697714b40ec53f3ca23f5f273 100644 (file)
--- a/models/access.go
+++ b/models/access.go
@@ -11,15 +11,15 @@ package models
 type AccessMode int
 
 const (
-       NoAccess AccessMode = iota
-       ReadAccess
-       WriteAccess
-       AdminAccess
-       OwnerAccess
+       ACCESS_MODE_NONE AccessMode = iota
+       ACCESS_MODE_READ
+       ACCESS_MODE_WRITE
+       ACCESS_MODE_ADMIN
+       ACCESS_MODE_OWNER
 )
 
 func maxAccessMode(modes ...AccessMode) AccessMode {
-       max := NoAccess
+       max := ACCESS_MODE_NONE
        for _, mode := range modes {
                if mode > max {
                        max = mode
@@ -47,14 +47,14 @@ func HasAccess(u *User, r *Repository, testMode AccessMode) (bool, error) {
 // Return the Access a user has to a repository. Will return NoneAccess if the
 // user does not have access. User can be nil!
 func AccessLevel(u *User, r *Repository) (AccessMode, error) {
-       mode := NoAccess
+       mode := ACCESS_MODE_NONE
        if !r.IsPrivate {
-               mode = ReadAccess
+               mode = ACCESS_MODE_READ
        }
 
        if u != nil {
                if u.Id == r.OwnerId {
-                       return OwnerAccess, nil
+                       return ACCESS_MODE_OWNER, nil
                }
 
                a := &Access{UserID: u.Id, RepoID: r.Id}
@@ -101,7 +101,7 @@ func (r *Repository) RecalcAccessSess() error {
                return err
        }
        for _, c := range collaborators {
-               accessMap[c.Id] = WriteAccess
+               accessMap[c.Id] = ACCESS_MODE_WRITE
        }
 
        if err := r.GetOwner(); err != nil {
@@ -126,9 +126,9 @@ func (r *Repository) RecalcAccessSess() error {
                }
        }
 
-       minMode := ReadAccess
+       minMode := ACCESS_MODE_READ
        if !r.IsPrivate {
-               minMode = WriteAccess
+               minMode = ACCESS_MODE_WRITE
        }
 
        newAccesses := make([]Access, 0, len(accessMap))

diff --git a/models/org.go b/models/org.go
index 5e3bb0e07017118ce69e8ca3310564cf8a40397b..f6d472a6d9cc6f16a9e16a085dd887cb686aeaab 100644 (file)
--- a/models/org.go
+++ b/models/org.go
@@ -135,7 +135,7 @@ func CreateOrganization(org, owner *User) (*User, error) {
                OrgId:      org.Id,
                LowerName:  strings.ToLower(OWNER_TEAM),
                Name:       OWNER_TEAM,
-               Authorize:  OwnerAccess,
+               Authorize:  ACCESS_MODE_OWNER,
                NumMembers: 1,
        }
        if _, err = sess.Insert(t); err != nil {

diff --git a/modules/middleware/org.go b/modules/middleware/org.go
index cbce54860d5794b291274ab745618053e39fa262..0e544fe4a2ad6a315d6a067cadb0a09e47afa072 100644 (file)
--- a/modules/middleware/org.go
+++ b/modules/middleware/org.go
@@ -87,7 +87,7 @@ func OrgAssignment(redirect bool, args ...bool) macaron.Handler {
                                return
                        }
                        ctx.Data["Team"] = ctx.Org.Team
-                       ctx.Org.IsAdminTeam = ctx.Org.Team.IsOwnerTeam() || ctx.Org.Team.Authorize >= models.AdminAccess
+                       ctx.Org.IsAdminTeam = ctx.Org.Team.IsOwnerTeam() || ctx.Org.Team.Authorize >= models.ACCESS_MODE_ADMIN
                }
                ctx.Data["IsAdminTeam"] = ctx.Org.IsAdminTeam
                if requireAdminTeam && !ctx.Org.IsAdminTeam {

diff --git a/modules/middleware/repo.go b/modules/middleware/repo.go
index 66e6f3a570595fa2352f92f5239bae1f66457d09..bc1d1f9692f7c01ffc01e35a24ae72cab0af15d9 100644 (file)
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@ -64,9 +64,9 @@ func ApiRepoAssignment() macaron.Handler {
                                ctx.JSON(500, &base.ApiJsonErr{"AccessLevel: " + err.Error(), base.DOC_URL})
                                return
                        }
-                       ctx.Repo.IsOwner = mode >= models.WriteAccess
-                       ctx.Repo.IsAdmin = mode >= models.ReadAccess
-                       ctx.Repo.IsTrueOwner = mode >= models.OwnerAccess
+                       ctx.Repo.IsOwner = mode >= models.ACCESS_MODE_WRITE
+                       ctx.Repo.IsAdmin = mode >= models.ACCESS_MODE_READ
+                       ctx.Repo.IsTrueOwner = mode >= models.ACCESS_MODE_OWNER
                }
 
                // Check access.
@@ -244,9 +244,9 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
                                ctx.JSON(500, &base.ApiJsonErr{"AccessLevel: " + err.Error(), base.DOC_URL})
                                return
                        }
-                       ctx.Repo.IsOwner = mode >= models.WriteAccess
-                       ctx.Repo.IsAdmin = mode >= models.ReadAccess
-                       ctx.Repo.IsTrueOwner = mode >= models.OwnerAccess
+                       ctx.Repo.IsOwner = mode >= models.ACCESS_MODE_WRITE
+                       ctx.Repo.IsAdmin = mode >= models.ACCESS_MODE_READ
+                       ctx.Repo.IsTrueOwner = mode >= models.ACCESS_MODE_OWNER
                }
 
                // Check access.

diff --git a/routers/api/v1/repo.go b/routers/api/v1/repo.go
index 78c9f9a6a3f6106fc826ca15f5c3f676d9e47d6e..f5128e47464d0462a6c2af0a73371d1855fe3172 100644 (file)
--- a/routers/api/v1/repo.go
+++ b/routers/api/v1/repo.go
@@ -255,7 +255,7 @@ func ListMyRepos(ctx *middleware.Context) {
                        return
                }
 
-               repos[i] = ToApiRepository(repo.Owner, repo, api.Permission{false, access >= models.WriteAccess, true})
+               repos[i] = ToApiRepository(repo.Owner, repo, api.Permission{false, access >= models.ACCESS_MODE_WRITE, true})
 
                // FIXME: cache result to reduce DB query?
                if repo.Owner.IsOrganization() && repo.Owner.IsOwnedBy(ctx.User.Id) {

diff --git a/routers/org/teams.go b/routers/org/teams.go
index 4fef02c987af5aabee89ba5127ad3e852806bcc0..a315abe03e320306237827d009b564294c3cb946 100644 (file)
--- a/routers/org/teams.go
+++ b/routers/org/teams.go
@@ -171,11 +171,11 @@ func NewTeamPost(ctx *middleware.Context, form auth.CreateTeamForm) {
        var auth models.AccessMode
        switch form.Permission {
        case "read":
-               auth = models.ReadAccess
+               auth = models.ACCESS_MODE_READ
        case "write":
-               auth = models.WriteAccess
+               auth = models.ACCESS_MODE_WRITE
        case "admin":
-               auth = models.AdminAccess
+               auth = models.ACCESS_MODE_ADMIN
        default:
                ctx.Error(401)
                return
@@ -252,11 +252,11 @@ func EditTeamPost(ctx *middleware.Context, form auth.CreateTeamForm) {
                var auth models.AccessMode
                switch form.Permission {
                case "read":
-                       auth = models.ReadAccess
+                       auth = models.ACCESS_MODE_READ
                case "write":
-                       auth = models.WriteAccess
+                       auth = models.ACCESS_MODE_WRITE
                case "admin":
-                       auth = models.AdminAccess
+                       auth = models.ACCESS_MODE_ADMIN
                default:
                        ctx.Error(401)
                        return

diff --git a/routers/repo/http.go b/routers/repo/http.go
index 716c71272a5641eb5e77ebc9212ee0c0f984671a..4173c7a91fb31fced189a851e143f1ab4f56d6eb 100644 (file)
--- a/routers/repo/http.go
+++ b/routers/repo/http.go
@@ -115,9 +115,9 @@ func Http(ctx *middleware.Context) {
                }
 
                if !isPublicPull {
-                       var tp = models.WriteAccess
+                       var tp = models.ACCESS_MODE_WRITE
                        if isPull {
-                               tp = models.ReadAccess
+                               tp = models.ACCESS_MODE_READ
                        }
 
                        has, err := models.HasAccess(authUser, repo, tp)
@@ -125,8 +125,8 @@ func Http(ctx *middleware.Context) {
                                ctx.Handle(401, "no basic auth and digit auth", nil)
                                return
                        } else if !has {
-                               if tp == models.ReadAccess {
-                                       has, err = models.HasAccess(authUser, repo, models.WriteAccess)
+                               if tp == models.ACCESS_MODE_READ {
+                                       has, err = models.HasAccess(authUser, repo, models.ACCESS_MODE_WRITE)
                                        if err != nil || !has {
                                                ctx.Handle(401, "no basic auth and digit auth", nil)
                                                return
@@ -268,7 +268,7 @@ func serviceRpc(rpc string, hr handler) {
 
        access := hasAccess(r, hr.Config, dir, rpc, true)
        if access == false {
-               renderNoAccess(w)
+               renderACCESS_MODE_NONE(w)
                return
        }
 
@@ -495,7 +495,7 @@ func renderNotFound(w http.ResponseWriter) {
        w.Write([]byte("Not Found"))
 }
 
-func renderNoAccess(w http.ResponseWriter) {
+func renderACCESS_MODE_NONE(w http.ResponseWriter) {
        w.WriteHeader(http.StatusForbidden)
        w.Write([]byte("Forbidden"))
 }

diff --git a/routers/user/home.go b/routers/user/home.go
index 82325cb747ab8fbf95ea852aabd024378b3ef32a..ce82ae772cb66a30f4f95f276b05b11d5477bf14 100644 (file)
--- a/routers/user/home.go
+++ b/routers/user/home.go
@@ -103,7 +103,7 @@ func Dashboard(ctx *middleware.Context) {
        feeds := make([]*models.Action, 0, len(actions))
        for _, act := range actions {
                if act.IsPrivate {
-                       if has, _ := models.HasAccess(ctx.User, &models.Repository{Id: act.RepoId, IsPrivate: true}, models.ReadAccess); !has {
+                       if has, _ := models.HasAccess(ctx.User, &models.Repository{Id: act.RepoId, IsPrivate: true}, models.ACCESS_MODE_READ); !has {
                                continue
                        }
                }
@@ -211,7 +211,7 @@ func Profile(ctx *middleware.Context) {
                                        continue
                                }
                                if has, _ := models.HasAccess(ctx.User, &models.Repository{Id: act.RepoId, IsPrivate: true},
-                                       models.ReadAccess); !has {
+                                       models.ACCESS_MODE_READ); !has {
                                        continue
                                }
                        }