From: Peter Smit <peter@smitmail.eu>
Date: Thu, 12 Feb 2015 12:25:07 +0000 (+0200)
Subject: Merge remote-tracking branch 'mine/access_refactor' into access_refactor
X-Git-Tag: v0.9.99~1438^2~13^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=6c1ee384f1a45ed97f39b085209bcb79cafd9145;p=gitea.git

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
---

6c1ee384f1a45ed97f39b085209bcb79cafd9145
diff --cc modules/middleware/repo.go
index 8cc6290460,bc1d1f9692..8465af83ef
--- a/modules/middleware/repo.go
+++ b/modules/middleware/repo.go
@@@ -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.