]> source.dussan.org Git - gitea.git/commitdiff
Merge remote-tracking branch 'mine/access_refactor' into access_refactor
authorPeter Smit <peter@smitmail.eu>
Thu, 12 Feb 2015 12:25:07 +0000 (14:25 +0200)
committerPeter Smit <peter@smitmail.eu>
Thu, 12 Feb 2015 12:25:07 +0000 (14:25 +0200)
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

1  2 
cmd/serve.go
models/access.go
models/org.go
models/user.go
modules/middleware/repo.go
routers/org/teams.go
routers/repo/http.go

diff --cc cmd/serve.go
Simple merge
Simple merge
diff --cc models/org.go
Simple merge
diff --cc models/user.go
Simple merge
index 8cc62904602ccdef97b1386081932e2f7b5be5c6,bc1d1f9692f7c01ffc01e35a24ae72cab0af15d9..8465af83efd37d5599d26c694733fe64198c2f86
@@@ -64,9 -64,9 +64,10 @@@ func ApiRepoAssignment() macaron.Handle
                                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.
Simple merge
Simple merge