mirrors
/
forgejo
mirror of
1
Fork 0
Code Issues Releases Activity

#1458: Authorities were messed up when using mysql database

This commit is contained in:
Unknwon 2015-08-28 13:51:15 +08:00
parent 70e0153b93
commit ff35a37769
5 changed files with 30 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gogs.go
View File

@ -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())

29
models/access.go
View File

@ -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,11 +156,14 @@ 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
}
@ -204,12 +188,15 @@ func (repo *Repository) recalculateTeamAccesses(e Engine, ignTeamID int64) (err
accessMap[m.Id] = maxAccessMode(accessMap[m.Id], t.Authorize)
}
}
}
return repo.refreshAccesses(e, accessMap)
}
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)

2
models/org.go
View File

@ -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) {

2
routers/install.go
View File

@ -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))
}

2
templates/.VERSION
View File

@ -1 +1 @@
0.6.6.0827 Beta
0.6.6.0828 Beta