diff options
| -rw-r--r-- | .bra.toml | 4 | ||||
| -rw-r--r-- | models/access.go | 19 |
2 files changed, 21 insertions, 2 deletions
@@ -14,7 +14,7 @@ watch_exts = [".go"] build_delay = 1500 cmds = [ #["go-bindata", "-o=modules/bindata/bindata.go", "-ignore=\\.DS_Store|README", "-pkg=bindata", "conf/..."], - ["go", "install", "-tags", "sqlite cert"],# redis memcache - ["go", "build", "-tags", "sqlite cert"], + ["go", "install", "-tags", "sqlite"],# redis memcache cert pam + ["go", "build", "-tags", "sqlite"], ["./gogs", "web"] ]
\ No newline at end of file diff --git a/models/access.go b/models/access.go index dd856afb71..51b60c9970 100644 --- a/models/access.go +++ b/models/access.go @@ -145,6 +145,25 @@ func (repo *Repository) refreshCollaboratorAccesses(e Engine, accessMap map[int6 for _, c := range collaborators { accessMap[c.Id] = ACCESS_MODE_WRITE } + + // Adds team members access. + if repo.Owner.IsOrganization() { + if err = repo.Owner.GetTeams(); err != nil { + return fmt.Errorf("GetTeams: %v", err) + } + for _, t := range repo.Owner.Teams { + if err = t.GetMembers(); err != nil { + return fmt.Errorf("GetMembers: %v", err) + } + for _, m := range t.Members { + if t.IsOwnerTeam() { + accessMap[m.Id] = ACCESS_MODE_OWNER + } else { + accessMap[m.Id] = maxAccessMode(accessMap[m.Id], t.Authorize) + } + } + } + } return nil } |