Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove org users who belong to no teams #24247

Merged

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Apr 21, 2023

Fix #24128

@yp05327 yp05327 changed the title Add remove org user check if team is deleted Remove the org user who belongs to no teams Apr 21, 2023
@yp05327 yp05327 changed the title Remove the org user who belongs to no teams Remove org users who belong to no teams Apr 21, 2023
@techknowlogick techknowlogick added this to the 1.20.0 milestone Apr 21, 2023
@techknowlogick techknowlogick added type/bug outdated/backport/v1.19 This PR should be backported to Gitea 1.19 labels Apr 21, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 21, 2023
models/org_team.go Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 21, 2023
models/org_team.go Outdated Show resolved Hide resolved
@@ -419,6 +419,12 @@ func DeleteTeam(t *organization.Team) error {
return err
}

for _, tm := range t.Members {
if err := removeInvalidOrgUser(ctx, tm.ID, t.OrgID); err != nil {
Copy link
Contributor

@wxiaoguang wxiaoguang Apr 24, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does it mean that this "team member" doesn't belong to other teams in this org?

Hmm ... I see the logic in removeInvalidOrgUser, it counts first.

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Apr 24, 2023
@silverwind silverwind added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 24, 2023
@silverwind silverwind enabled auto-merge (squash) April 24, 2023 19:24
@silverwind silverwind merged commit 8cc60ee into go-gitea:main Apr 24, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 24, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Apr 24, 2023
Fix go-gitea#24128

---------

Co-authored-by: silverwind <me@silverwind.io>
@GiteaBot GiteaBot added the backport/done All backports for this PR have been created label Apr 24, 2023
techknowlogick pushed a commit that referenced this pull request Apr 25, 2023
Backport #24247 by @yp05327

Fix #24128

Co-authored-by: yp05327 <576951401@qq.com>
Co-authored-by: silverwind <me@silverwind.io>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 25, 2023
* giteaofficial/main:
  default show closed actions list if all actions was closed (go-gitea#24234)
  [skip ci] Updated translations via Crowdin
  update nightly drone docker tag (go-gitea#24311)
  Remove org users who belong to no teams (go-gitea#24247)
  Fix typo in API route (go-gitea#24310)
  Add --font-weight-bold and set previous bold to 601 (go-gitea#24307)
  Mark `/templates/swagger/v1_json.tmpl` as generated file (go-gitea#24306)
  Improve External Wiki in Repo Header (go-gitea#24304)
  Unify nightly naming across binaries and docker images (go-gitea#24116)
  Wrap too long push mirror addresses (go-gitea#21120)
@yp05327 yp05327 deleted the add-remove-org-user-check-if-team-deleted branch April 25, 2023 06:03
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 31, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

A user should no longer belong to the org after the team he belongs to is deleted
6 participants