lianguan/gitea
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Move deletebeans into models/db (#18781)

Browse Source
This commit is contained in:
Lunny Xiao
2022-02-17 16:37:48 +08:00
committed by GitHub
parent bd71245c53
commit 397d2ac303
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
models/org.go
View File

@ -331,9 +331,7 @@ func DeleteOrganization(ctx context.Context, org *Organization) error {
return fmt.Errorf("%s is a user not an organization", org.Name)
}
e := db.GetEngine(ctx)
if err := deleteBeans(e,
if err := db.DeleteBeans(ctx,
&Team{OrgID: org.ID},
&OrgUser{OrgID: org.ID},
&TeamUser{OrgID: org.ID},
@ -342,7 +340,7 @@ func DeleteOrganization(ctx context.Context, org *Organization) error {
return fmt.Errorf("deleteBeans: %v", err)
}
if _, err := e.ID(org.ID).Delete(new(user_model.User)); err != nil {
if _, err := db.GetEngine(ctx).ID(org.ID).Delete(new(user_model.User)); err != nil {
return fmt.Errorf("Delete: %v", err)
}