ddmt/gitdts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into team-grant-all-repos

Browse Source
This commit is contained in:
David Svantesson
2019-10-25 21:41:03 +02:00
parent 06ac307a00 6aa3f8bc29
commit 3f291df116
889 changed files with 25919 additions and 8095 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
models/org_team.go
View File

@@ -14,8 +14,8 @@ import (
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"github.com/go-xorm/xorm"
"xorm.io/builder"
"xorm.io/xorm"
)
const ownerTeamName = "Owners"
@@ -341,7 +341,7 @@ func (t *Team) UnitEnabled(tp UnitType) bool {
func (t *Team) unitEnabled(e Engine, tp UnitType) bool {
if err := t.getUnits(e); err != nil {
log.Warn("Error loading repository (ID: %d) units: %s", t.ID, err.Error())
log.Warn("Error loading team (ID: %d) units: %s", t.ID, err.Error())
}
for _, unit := range t.Units {
@@ -766,7 +766,7 @@ func AddTeamMember(team *Team, userID int64) error {
// Give access to team repositories.
for _, repo := range team.Repos {
if err := repo.recalculateTeamAccesses(sess, 0); err != nil {
if err := repo.recalculateUserAccess(sess, userID); err != nil {
return err
}
if setting.Service.AutoWatchNewRepos {
@@ -811,7 +811,7 @@ func removeTeamMember(e *xorm.Session, team *Team, userID int64) error {
// Delete access to team repositories.
for _, repo := range team.Repos {
if err := repo.recalculateTeamAccesses(e, 0); err != nil {
if err := repo.recalculateUserAccess(e, userID); err != nil {
return err
}