diff options
author | Lunny Xiao <xiaolunwen@gmail.com> | 2023-10-15 23:46:06 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-15 17:46:06 +0200 |
commit | cddf245c12223c783c856c87c21cc796ac425439 (patch) | |
tree | 21edf50797c62c3e70dbada95edc20d7ddfd53b8 /routers | |
parent | 7480aacdad9470458fa0142beab54b8011bbac25 (diff) | |
download | gitea-cddf245c12223c783c856c87c21cc796ac425439.tar.gz gitea-cddf245c12223c783c856c87c21cc796ac425439.zip |
Replace more db.DefaultContext (#27628)
Target #27065
Diffstat (limited to 'routers')
-rw-r--r-- | routers/api/v1/org/member.go | 2 | ||||
-rw-r--r-- | routers/api/v1/org/org.go | 2 | ||||
-rw-r--r-- | routers/api/v1/user/repo.go | 2 | ||||
-rw-r--r-- | routers/init.go | 4 | ||||
-rw-r--r-- | routers/web/admin/admin.go | 4 | ||||
-rw-r--r-- | routers/web/org/members.go | 4 | ||||
-rw-r--r-- | routers/web/org/setting.go | 4 | ||||
-rw-r--r-- | routers/web/user/home_test.go | 3 | ||||
-rw-r--r-- | routers/web/user/package.go | 2 | ||||
-rw-r--r-- | routers/web/user/setting/profile.go | 4 |
10 files changed, 16 insertions, 15 deletions
diff --git a/routers/api/v1/org/member.go b/routers/api/v1/org/member.go index 139e01e1f9..422b7cecfe 100644 --- a/routers/api/v1/org/member.go +++ b/routers/api/v1/org/member.go @@ -318,7 +318,7 @@ func DeleteMember(ctx *context.APIContext) { if ctx.Written() { return } - if err := models.RemoveOrgUser(ctx.Org.Organization.ID, member.ID); err != nil { + if err := models.RemoveOrgUser(ctx, ctx.Org.Organization.ID, member.ID); err != nil { ctx.Error(http.StatusInternalServerError, "RemoveOrgUser", err) } ctx.Status(http.StatusNoContent) diff --git a/routers/api/v1/org/org.go b/routers/api/v1/org/org.go index 2594e4afbb..4579f3b085 100644 --- a/routers/api/v1/org/org.go +++ b/routers/api/v1/org/org.go @@ -385,7 +385,7 @@ func Delete(ctx *context.APIContext) { // "404": // "$ref": "#/responses/notFound" - if err := org.DeleteOrganization(ctx.Org.Organization); err != nil { + if err := org.DeleteOrganization(ctx, ctx.Org.Organization); err != nil { ctx.Error(http.StatusInternalServerError, "DeleteOrganization", err) return } diff --git a/routers/api/v1/user/repo.go b/routers/api/v1/user/repo.go index 26ebf89746..b8b2d265bf 100644 --- a/routers/api/v1/user/repo.go +++ b/routers/api/v1/user/repo.go @@ -21,7 +21,7 @@ import ( func listUserRepos(ctx *context.APIContext, u *user_model.User, private bool) { opts := utils.GetListOptions(ctx) - repos, count, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{ + repos, count, err := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{ Actor: u, Private: private, ListOptions: opts, diff --git a/routers/init.go b/routers/init.go index 015b61a08e..c1cfe26bc4 100644 --- a/routers/init.go +++ b/routers/init.go @@ -72,7 +72,7 @@ func mustInitCtx(ctx context.Context, fn func(ctx context.Context) error) { func syncAppConfForGit(ctx context.Context) error { runtimeState := new(system.RuntimeState) - if err := system.AppState.Get(runtimeState); err != nil { + if err := system.AppState.Get(ctx, runtimeState); err != nil { return err } @@ -95,7 +95,7 @@ func syncAppConfForGit(ctx context.Context) error { log.Info("re-write ssh public keys ...") mustInitCtx(ctx, asymkey_model.RewriteAllPublicKeys) - return system.AppState.Set(runtimeState) + return system.AppState.Set(ctx, runtimeState) } return nil } diff --git a/routers/web/admin/admin.go b/routers/web/admin/admin.go index e34124049e..1838fe190c 100644 --- a/routers/web/admin/admin.go +++ b/routers/web/admin/admin.go @@ -127,8 +127,8 @@ func prepareDeprecatedWarningsAlert(ctx *context.Context) { func Dashboard(ctx *context.Context) { ctx.Data["Title"] = ctx.Tr("admin.dashboard") ctx.Data["PageIsAdminDashboard"] = true - ctx.Data["NeedUpdate"] = updatechecker.GetNeedUpdate() - ctx.Data["RemoteVersion"] = updatechecker.GetRemoteVersion() + ctx.Data["NeedUpdate"] = updatechecker.GetNeedUpdate(ctx) + ctx.Data["RemoteVersion"] = updatechecker.GetRemoteVersion(ctx) // FIXME: update periodically updateSystemStatus() ctx.Data["SysStatus"] = sysStatus diff --git a/routers/web/org/members.go b/routers/web/org/members.go index 247025a7cb..15a615c706 100644 --- a/routers/web/org/members.go +++ b/routers/web/org/members.go @@ -104,14 +104,14 @@ func MembersAction(ctx *context.Context) { ctx.Error(http.StatusNotFound) return } - err = models.RemoveOrgUser(org.ID, uid) + err = models.RemoveOrgUser(ctx, org.ID, uid) if organization.IsErrLastOrgOwner(err) { ctx.Flash.Error(ctx.Tr("form.last_org_owner")) ctx.JSONRedirect(ctx.Org.OrgLink + "/members") return } case "leave": - err = models.RemoveOrgUser(org.ID, ctx.Doer.ID) + err = models.RemoveOrgUser(ctx, org.ID, ctx.Doer.ID) if err == nil { ctx.Flash.Success(ctx.Tr("form.organization_leave_success", org.DisplayName())) ctx.JSON(http.StatusOK, map[string]any{ diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index c3eb7ff551..2f2f7c14bd 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -124,7 +124,7 @@ func SettingsPost(ctx *context.Context) { // update forks visibility if visibilityChanged { - repos, _, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{ + repos, _, err := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{ Actor: org.AsUser(), Private: true, ListOptions: db.ListOptions{Page: 1, PageSize: org.NumRepos}, }) if err != nil { @@ -180,7 +180,7 @@ func SettingsDelete(ctx *context.Context) { return } - if err := org_service.DeleteOrganization(ctx.Org.Organization); err != nil { + if err := org_service.DeleteOrganization(ctx, ctx.Org.Organization); err != nil { if models.IsErrUserOwnRepos(err) { ctx.Flash.Error(ctx.Tr("form.org_still_own_repo")) ctx.Redirect(ctx.Org.OrgLink + "/settings/delete") diff --git a/routers/web/user/home_test.go b/routers/web/user/home_test.go index 0be9790548..1eb1fad057 100644 --- a/routers/web/user/home_test.go +++ b/routers/web/user/home_test.go @@ -7,6 +7,7 @@ import ( "net/http" "testing" + "code.gitea.io/gitea/models/db" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/modules/contexttest" @@ -25,7 +26,7 @@ func TestArchivedIssues(t *testing.T) { ctx.Req.Form.Set("state", "open") // Assume: User 30 has access to two Repos with Issues, one of the Repos being archived. - repos, _, _ := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{Actor: ctx.Doer}) + repos, _, _ := repo_model.GetUserRepositories(db.DefaultContext, &repo_model.SearchRepoOptions{Actor: ctx.Doer}) assert.Len(t, repos, 3) IsArchived := make(map[int64]bool) NumIssues := make(map[int64]int) diff --git a/routers/web/user/package.go b/routers/web/user/package.go index cc200cc4d7..d8da6a192e 100644 --- a/routers/web/user/package.go +++ b/routers/web/user/package.go @@ -383,7 +383,7 @@ func PackageSettings(ctx *context.Context) { ctx.Data["IsPackagesPage"] = true ctx.Data["PackageDescriptor"] = pd - repos, _, _ := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{ + repos, _, _ := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{ Actor: pd.Owner, Private: true, }) diff --git a/routers/web/user/setting/profile.go b/routers/web/user/setting/profile.go index c97e66574e..2390b0746c 100644 --- a/routers/web/user/setting/profile.go +++ b/routers/web/user/setting/profile.go @@ -287,7 +287,7 @@ func Repos(ctx *context.Context) { return } - userRepos, _, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{ + userRepos, _, err := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{ Actor: ctxUser, Private: true, ListOptions: db.ListOptions{ @@ -312,7 +312,7 @@ func Repos(ctx *context.Context) { ctx.Data["Dirs"] = repoNames ctx.Data["ReposMap"] = repos } else { - repos, count64, err := repo_model.GetUserRepositories(&repo_model.SearchRepoOptions{Actor: ctxUser, Private: true, ListOptions: opts}) + repos, count64, err := repo_model.GetUserRepositories(ctx, &repo_model.SearchRepoOptions{Actor: ctxUser, Private: true, ListOptions: opts}) if err != nil { ctx.ServerError("GetUserRepositories", err) return |