diff options
| author | Peter Smit <peter@smitmail.eu> | 2015-02-12 14:25:07 +0200 |
|---|---|---|
| committer | Peter Smit <peter@smitmail.eu> | 2015-02-12 14:25:07 +0200 |
| commit | 6c1ee384f1a45ed97f39b085209bcb79cafd9145 (patch) | |
| tree | 0798c98ff2fa93324edae6cfcb539cf51fc4b7fd /routers/org/teams.go | |
| parent | 0a4cda0dd4d7c906668d9d2e283fbe9ebe2e1608 (diff) | |
| parent | 0d158e569b0c19614b5e946849e8b7a8e4a75015 (diff) | |
| download | gitea-6c1ee384f1a45ed97f39b085209bcb79cafd9145.tar.gz gitea-6c1ee384f1a45ed97f39b085209bcb79cafd9145.zip | |
Merge remote-tracking branch 'mine/access_refactor' into access_refactor
Conflicts:
cmd/serve.go
models/access.go
models/migrations/migrations.go
models/org.go
models/repo.go
models/user.go
modules/middleware/org.go
modules/middleware/repo.go
routers/api/v1/repo.go
routers/org/teams.go
routers/repo/http.go
routers/user/home.go
Diffstat (limited to 'routers/org/teams.go')
| -rw-r--r-- | routers/org/teams.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/routers/org/teams.go b/routers/org/teams.go index f5f94be0f4..2fbb1480d1 100644 --- a/routers/org/teams.go +++ b/routers/org/teams.go @@ -168,11 +168,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 @@ -249,11 +249,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 |