diff options
| -rw-r--r-- | gogs.go | 2 | ||||
| -rw-r--r-- | models/access.go | 5 | ||||
| -rw-r--r-- | models/repo.go | 15 | ||||
| -rw-r--r-- | templates/.VERSION | 2 |
4 files changed, 20 insertions, 4 deletions
@@ -17,7 +17,7 @@ import ( "github.com/gogits/gogs/modules/setting" ) -const APP_VER = "0.6.0.0323 Beta" +const APP_VER = "0.6.1.0324 Beta" func init() { runtime.GOMAXPROCS(runtime.NumCPU()) diff --git a/models/access.go b/models/access.go index ea2f7f7b4b..dd856afb71 100644 --- a/models/access.go +++ b/models/access.go @@ -170,8 +170,13 @@ func (repo *Repository) recalculateTeamAccesses(e Engine, ignTeamID int64) (err if t.ID == ignTeamID { continue } + + // Owner team gets owner access, and skip for teams that do not + // have relations with repository. if t.IsOwnerTeam() { t.Authorize = ACCESS_MODE_OWNER + } else if !t.hasRepository(e, repo.Id) { + continue } if err = t.getMembers(e); err != nil { diff --git a/models/repo.go b/models/repo.go index cfab329bab..73b635d240 100644 --- a/models/repo.go +++ b/models/repo.go @@ -1107,6 +1107,10 @@ func (repo *Repository) AddCollaborator(u *User) error { return nil } + if err = repo.GetOwner(); err != nil { + return fmt.Errorf("GetOwner: %v", err) + } + sess := x.NewSession() defer sessionRelease(sess) if err = sess.Begin(); err != nil { @@ -1115,8 +1119,15 @@ func (repo *Repository) AddCollaborator(u *User) error { if _, err = sess.InsertOne(collaboration); err != nil { return err - } else if err = repo.recalculateAccesses(sess); err != nil { - return err + } + + if repo.Owner.IsOrganization() { + err = repo.recalculateTeamAccesses(sess, 0) + } else { + err = repo.recalculateAccesses(sess) + } + if err != nil { + return fmt.Errorf("recalculateAccesses 'team=%v': %v", repo.Owner.IsOrganization(), err) } return sess.Commit() diff --git a/templates/.VERSION b/templates/.VERSION index 56c56c927f..8c1d7394e4 100644 --- a/templates/.VERSION +++ b/templates/.VERSION @@ -1 +1 @@ -0.6.0.0323 Beta
\ No newline at end of file +0.6.1.0324 Beta
\ No newline at end of file |