aboutsummaryrefslogtreecommitdiffstats
path: root/models/org_team.go
diff options
context:
space:
mode:
Diffstat (limited to 'models/org_team.go')
-rw-r--r--models/org_team.go13
1 files changed, 3 insertions, 10 deletions
diff --git a/models/org_team.go b/models/org_team.go
index 82c27b2c06..a3f1eb92a2 100644
--- a/models/org_team.go
+++ b/models/org_team.go
@@ -917,19 +917,12 @@ func removeTeamMember(e *xorm.Session, team *Team, userID int64) error {
}
// Remove watches from now unaccessible
- has, err := hasAccess(e, userID, repo)
- if err != nil {
+ if err := repo.reconsiderWatches(e, userID); err != nil {
return err
- } else if has {
- continue
}
- if err = watchRepo(e, userID, repo.ID, false); err != nil {
- return err
- }
-
- // Remove all IssueWatches a user has subscribed to in the repositories
- if err := removeIssueWatchersByRepoID(e, userID, repo.ID); err != nil {
+ // Remove issue assignments from now unaccessible
+ if err := repo.reconsiderIssueAssignees(e, userID); err != nil {
return err
}
}