#1458: Authorities were messed up when using mysql database

diff --git a/gogs.go b/gogs.go
index f661dc77db34de5e51898faf90fe7cd98aaa6d9d..dc7027878c55bdadf270d5eee418998dbc0364a8 100644 (file)
--- a/gogs.go
+++ b/gogs.go
@@ -17,7 +17,7 @@ import (
        "github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.6.6.0827 Beta"
+const APP_VER = "0.6.6.0828 Beta"
 
 func init() {
        runtime.GOMAXPROCS(runtime.NumCPU())

diff --git a/models/access.go b/models/access.go
index 917f1c280de904870cd2b65ca9498e754b728b2b..fe8bf2c17e40527cd6b095c2d765afb19498f339 100644 (file)
--- a/models/access.go
+++ b/models/access.go
@@ -145,25 +145,6 @@ 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
 }
 
@@ -175,34 +156,36 @@ func (repo *Repository) recalculateTeamAccesses(e Engine, ignTeamID int64) (err
 
        if err = repo.getOwner(e); err != nil {
                return err
+       } else if !repo.Owner.IsOrganization() {
+               return fmt.Errorf("owner is not an organization: %d", repo.OwnerID)
        }
+
        if err = repo.refreshCollaboratorAccesses(e, accessMap); err != nil {
                return fmt.Errorf("refreshCollaboratorAccesses: %v", err)
        }
-       if repo.Owner.IsOrganization() {
-               if err = repo.Owner.getTeams(e); err != nil {
-                       return err
-               }
 
-               for _, t := range repo.Owner.Teams {
-                       if t.ID == ignTeamID {
-                               continue
-                       }
+       if err = repo.Owner.getTeams(e); err != nil {
+               return err
+       }
 
-                       // 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
-                       }
+       for _, t := range repo.Owner.Teams {
+               if t.ID == ignTeamID {
+                       continue
+               }
 
-                       if err = t.getMembers(e); err != nil {
-                               return fmt.Errorf("getMembers '%d': %v", t.ID, err)
-                       }
-                       for _, m := range t.Members {
-                               accessMap[m.Id] = maxAccessMode(accessMap[m.Id], t.Authorize)
-                       }
+               // 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 {
+                       return fmt.Errorf("getMembers '%d': %v", t.ID, err)
+               }
+               for _, m := range t.Members {
+                       accessMap[m.Id] = maxAccessMode(accessMap[m.Id], t.Authorize)
                }
        }
 
@@ -210,6 +193,10 @@ func (repo *Repository) recalculateTeamAccesses(e Engine, ignTeamID int64) (err
 }
 
 func (repo *Repository) recalculateAccesses(e Engine) error {
+       if repo.Owner.IsOrganization() {
+               return repo.recalculateTeamAccesses(e, 0)
+       }
+
        accessMap := make(map[int64]AccessMode, 20)
        if err := repo.refreshCollaboratorAccesses(e, accessMap); err != nil {
                return fmt.Errorf("refreshCollaboratorAccesses: %v", err)

diff --git a/models/org.go b/models/org.go
index b8d194567231af497086b503051032ece07bfadd..dfd720fadee6555c184cc3f47d384b8d5f5b92d7 100644 (file)
--- a/models/org.go
+++ b/models/org.go
@@ -483,7 +483,7 @@ func (t *Team) hasRepository(e Engine, repoID int64) bool {
 
 // HasRepository returns true if given repository belong to team.
 func (t *Team) HasRepository(repoID int64) bool {
-       return HasTeamRepo(t.OrgID, t.ID, repoID)
+       return t.hasRepository(x, repoID)
 }
 
 func (t *Team) addRepository(e Engine, repo *Repository) (err error) {

diff --git a/routers/install.go b/routers/install.go
index 3fcaee8db6d805f507524d8d778c05620969f8e1..0a8af4f2842ab74e910dcb6153962bdfac5b22c7 100644 (file)
--- a/routers/install.go
+++ b/routers/install.go
@@ -39,8 +39,6 @@ func checkRunMode() {
                macaron.Env = macaron.PROD
                macaron.ColorLog = false
                setting.ProdMode = true
-       case "test":
-               macaron.Env = macaron.TEST
        }
        log.Info("Run Mode: %s", strings.Title(macaron.Env))
 }

diff --git a/templates/.VERSION b/templates/.VERSION
index a82682d43e1f84c9077c8fc7afb1bca53ee00adb..7ff14d43a44c2a1c4f24ae89e21635aff086e2b0 100644 (file)
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.6.6.0827 Beta
\ No newline at end of file
+0.6.6.0828 Beta
\ No newline at end of file