tokarchuk/v1.17
Unknwon 9 years ago
parent ee686f6231
commit 2158e6fc43
  1. 2
      gogs.go
  2. 8
      models/access.go
  3. 2
      modules/middleware/repo.go
  4. 2
      templates/.VERSION

@ -17,7 +17,7 @@ import (
"github.com/gogits/gogs/modules/setting"
)
const APP_VER = "0.7.18.1118 Beta"
const APP_VER = "0.7.18.1119 Beta"
func init() {
runtime.GOMAXPROCS(runtime.NumCPU())

@ -36,7 +36,10 @@ func accessLevel(e Engine, u *User, repo *Repository) (AccessMode, error) {
mode = ACCESS_MODE_READ
}
if u != nil {
if u == nil {
return mode, nil
}
if u.Id == repo.OwnerID {
return ACCESS_MODE_OWNER, nil
}
@ -48,9 +51,6 @@ func accessLevel(e Engine, u *User, repo *Repository) (AccessMode, error) {
return a.Mode, nil
}
return mode, nil
}
// AccessLevel returns 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, repo *Repository) (AccessMode, error) {

@ -275,7 +275,7 @@ func RepoAssignment(redirect bool, args ...bool) macaron.Handler {
}
// Admin has super access.
if ctx.User.IsAdmin {
if ctx.IsSigned && ctx.User.IsAdmin {
ctx.Repo.AccessMode = models.ACCESS_MODE_OWNER
} else {
mode, err := models.AccessLevel(ctx.User, repo)

@ -1 +1 @@
0.7.18.1118 Beta
0.7.18.1119 Beta
Loading…
Cancel
Save