Fix some bug

models/migrations/v205.go

@@ -12,19 +12,19 @@ import (
 
 func addAuthorizeColForTeamUnit(x *xorm.Engine) error {
 	type TeamUnit struct {
-		ID        int64 `xorm:"pk autoincr"`
-		OrgID     int64 `xorm:"INDEX"`
-		TeamID    int64 `xorm:"UNIQUE(s)"`
-		Type      int   `xorm:"UNIQUE(s)"`
-		Authorize int
+		ID         int64 `xorm:"pk autoincr"`
+		OrgID      int64 `xorm:"INDEX"`
+		TeamID     int64 `xorm:"UNIQUE(s)"`
+		Type       int   `xorm:"UNIQUE(s)"`
+		AccessMode int
 	}
 
 	if err := x.Sync2(new(TeamUnit)); err != nil {
 		return fmt.Errorf("sync2: %v", err)
 	}
 
 	// migrate old permission
-	_, err := x.Exec("UPDATE team_unit SET authorize = (SELECT authorize FROM team WHERE team.id = team_unit.team_id)")
+	_, err := x.Exec("UPDATE team_unit SET access_mode = (SELECT authorize FROM team WHERE team.id = team_unit.team_id)")
 	return err
 
 }

models/unit/unit.go

@@ -321,7 +321,7 @@ func AllUnitKeyNames() []string {
 func MinUnitAccessMode(unitsMap map[Type]perm.AccessMode) perm.AccessMode {
 	var res = perm.AccessModeNone
 	for _, mode := range unitsMap {
-		if mode > perm.AccessModeNone && (res == perm.AccessModeNone || mode < res) {
+		if mode > perm.AccessModeNone && mode < res {
 			res = mode
 		}
 	}

modules/structs/org_team.go

@@ -15,6 +15,7 @@ type Team struct {
 	// enum: none,read,write,admin,owner
 	Permission string `json:"permission"`
 	// example: ["repo.code","repo.issues","repo.ext_issues","repo.wiki","repo.pulls","repo.releases","repo.projects","repo.ext_wiki"]
+	// Deprecated: This variable should be replaced by UnitsMap and will be dropped in later versions.
 	Units []string `json:"units"`
 	// example: {"repo.code":"read","repo.issues":"write","repo.ext_issues":"none","repo.wiki":"admin","repo.pulls":"owner","repo.releases":"none","repo.projects":"none","repo.ext_wiki":"none"]
 	UnitsMap         map[string]string `json:"units_map"`