diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2022-05-20 22:08:52 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-20 22:08:52 +0800 |
commit | fd7d83ace60258acf7139c4c787aa8af75b7ba8c (patch) | |
tree | 50038348ec10485f72344f3ac80324e04abc1283 /models/org.go | |
parent | d81e31ad7826a81fc7139f329f250594610a274b (diff) | |
download | gitea-fd7d83ace60258acf7139c4c787aa8af75b7ba8c.tar.gz gitea-fd7d83ace60258acf7139c4c787aa8af75b7ba8c.zip |
Move almost all functions' parameter db.Engine to context.Context (#19748)
* Move almost all functions' parameter db.Engine to context.Context
* remove some unnecessary wrap functions
Diffstat (limited to 'models/org.go')
-rw-r--r-- | models/org.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/models/org.go b/models/org.go index 1efa0504ea..681b367f45 100644 --- a/models/org.go +++ b/models/org.go @@ -95,7 +95,7 @@ func removeOrgUser(ctx context.Context, orgID, userID int64) error { return nil } - org, err := organization.GetOrgByIDCtx(ctx, orgID) + org, err := organization.GetOrgByID(ctx, orgID) if err != nil { return fmt.Errorf("GetUserByID [%d]: %v", orgID, err) } @@ -120,7 +120,7 @@ func removeOrgUser(ctx context.Context, orgID, userID int64) error { if _, err := sess.ID(ou.ID).Delete(ou); err != nil { return err - } else if _, err = sess.Exec("UPDATE `user` SET num_members=num_members-1 WHERE id=?", orgID); err != nil { + } else if _, err = db.Exec(ctx, "UPDATE `user` SET num_members=num_members-1 WHERE id=?", orgID); err != nil { return err } @@ -134,7 +134,7 @@ func removeOrgUser(ctx context.Context, orgID, userID int64) error { return fmt.Errorf("GetUserRepositories [%d]: %v", userID, err) } for _, repoID := range repoIDs { - if err = repo_model.WatchRepoCtx(ctx, userID, repoID, false); err != nil { + if err = repo_model.WatchRepo(ctx, userID, repoID, false); err != nil { return err } } |