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

Use `ctx` instead of `db.DefaultContext` in some packages(routers/services/modules) (#19163)

Browse Source 
* Remove `db.DefaultContext` usage in routers, use `ctx` directly

* Use `ctx` directly if there is one, remove some `db.DefaultContext` in `services`

* Use ctx instead of db.DefaultContext for `cmd` and some `modules` packages

* fix incorrect context usage
tokarchuk/v1.17
wxiaoguang 3 years ago committed by GitHub
parent 2b55422cd7
commit 7a550b3af2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
51 changed files with 117 additions and 124 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      cmd/admin.go
  2. 7
      modules/context/repo.go
  3. 2
      modules/doctor/checkOldArchives.go
  4. 2
      modules/doctor/fix16961.go
  5. 8
      modules/doctor/mergebase.go
  6. 12
      modules/doctor/misc.go
  7. 2
      modules/repository/repo.go
  8. 3
      modules/test/context_tests.go
  9. 2
      routers/api/v1/org/org.go
  10. 5
      routers/api/v1/repo/issue_stopwatch.go
  11. 2
      routers/api/v1/repo/key.go
  12. 2
      routers/api/v1/repo/repo.go
  13. 2
      routers/api/v1/user/gpg_key.go
  14. 3
      routers/api/v1/user/repo.go
  15. 3
      routers/api/v1/utils/hook.go
  16. 10
      routers/web/auth/auth.go
  17. 5
      routers/web/auth/oauth.go
  18. 5
      routers/web/auth/password.go
  19. 2
      routers/web/org/org_labels.go
  20. 3
      routers/web/repo/compare.go
  21. 3
      routers/web/repo/http.go
  22. 2
      routers/web/repo/issue.go
  23. 11
      routers/web/repo/issue_content_history.go
  24. 2
      routers/web/repo/issue_label.go
  25. 4
      routers/web/repo/pull.go
  26. 8
      routers/web/repo/repo.go
  27. 6
      routers/web/repo/setting.go
  28. 4
      routers/web/repo/view.go
  29. 23
      routers/web/repo/webhook.go
  30. 4
      routers/web/user/home.go
  31. 3
      routers/web/user/setting/account.go
  32. 2
      routers/web/user/setting/keys.go
  33. 2
      routers/web/user/setting/profile.go
  34. 8
      services/asymkey/sign.go
  35. 2
      services/auth/source/ldap/source_sync.go
  36. 2
      services/mailer/mail.go
  37. 4
      services/mailer/mail_issue.go
  38. 3
      services/mailer/mail_release.go
  39. 10
      services/mailer/mail_test.go
  40. 2
      services/migrations/gitea_uploader.go
  41. 3
      services/mirror/mirror_pull.go
  42. 3
      services/pull/check.go
  43. 5
      services/pull/merge.go
  44. 2
      services/pull/pull.go
  45. 2
      services/pull/review.go
  46. 5
      services/pull/temp_repo.go
  47. 4
      services/release/release.go
  48. 8
      services/repository/check.go
  49. 2
      services/repository/hooks.go
  50. 2
      services/repository/push.go
  51. 4
      services/user/user.go

2
cmd/admin.go
Unescape View File

@ -493,7 +493,7 @@ func runChangePassword(c *cli.Context) error {
return err return err
} }
if err = user_model.UpdateUserCols(db.DefaultContext, user, "passwd", "passwd_hash_algo", "salt"); err != nil { if err = user_model.UpdateUserCols(ctx, user, "passwd", "passwd_hash_algo", "salt"); err != nil {
return err return err
} }

7
modules/context/repo.go
Unescape View File

@ -15,7 +15,6 @@ import (
"strings" "strings"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
unit_model "code.gitea.io/gitea/models/unit" unit_model "code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
@ -256,7 +255,7 @@ func RetrieveBaseRepo(ctx *Context, repo *repo_model.Repository) {
} }
ctx.ServerError("GetBaseRepo", err) ctx.ServerError("GetBaseRepo", err)
return return
} else if err = repo.BaseRepo.GetOwner(db.DefaultContext); err != nil { } else if err = repo.BaseRepo.GetOwner(ctx); err != nil {
ctx.ServerError("BaseRepo.GetOwner", err) ctx.ServerError("BaseRepo.GetOwner", err)
return return
} }
@ -273,7 +272,7 @@ func RetrieveTemplateRepo(ctx *Context, repo *repo_model.Repository) {
} }
ctx.ServerError("GetTemplateRepo", err) ctx.ServerError("GetTemplateRepo", err)
return return
} else if err = templateRepo.GetOwner(db.DefaultContext); err != nil { } else if err = templateRepo.GetOwner(ctx); err != nil {
ctx.ServerError("TemplateRepo.GetOwner", err) ctx.ServerError("TemplateRepo.GetOwner", err)
return return
} }
@ -341,7 +340,7 @@ func RedirectToRepo(ctx *Context, redirectRepoID int64) {
func repoAssignment(ctx *Context, repo *repo_model.Repository) { func repoAssignment(ctx *Context, repo *repo_model.Repository) {
var err error var err error
if err = repo.GetOwner(db.DefaultContext); err != nil { if err = repo.GetOwner(ctx); err != nil {
ctx.ServerError("GetOwner", err) ctx.ServerError("GetOwner", err)
return return
} }

2
modules/doctor/checkOldArchives.go
Unescape View File

@ -17,7 +17,7 @@ import (
func checkOldArchives(ctx context.Context, logger log.Logger, autofix bool) error { func checkOldArchives(ctx context.Context, logger log.Logger, autofix bool) error {
numRepos := 0 numRepos := 0
numReposUpdated := 0 numReposUpdated := 0
err := iterateRepositories(func(repo *repo_model.Repository) error { err := iterateRepositories(ctx, func(repo *repo_model.Repository) error {
if repo.IsEmpty { if repo.IsEmpty {
return nil return nil
} }

2
modules/doctor/fix16961.go
Unescape View File

@ -268,7 +268,7 @@ func fixBrokenRepoUnits16961(ctx context.Context, logger log.Logger, autofix boo
count := 0 count := 0
err := db.Iterate( err := db.Iterate(
db.DefaultContext, ctx,
new(RepoUnit), new(RepoUnit),
builder.Gt{ builder.Gt{
"id": 0, "id": 0,

8
modules/doctor/mergebase.go
Unescape View File

@ -18,9 +18,9 @@ import (
"xorm.io/builder" "xorm.io/builder"
) )
func iteratePRs(repo *repo_model.Repository, each func(*repo_model.Repository, *models.PullRequest) error) error { func iteratePRs(ctx context.Context, repo *repo_model.Repository, each func(*repo_model.Repository, *models.PullRequest) error) error {
return db.Iterate( return db.Iterate(
db.DefaultContext, ctx,
new(models.PullRequest), new(models.PullRequest),
builder.Eq{"base_repo_id": repo.ID}, builder.Eq{"base_repo_id": repo.ID},
func(idx int, bean interface{}) error { func(idx int, bean interface{}) error {
@ -33,9 +33,9 @@ func checkPRMergeBase(ctx context.Context, logger log.Logger, autofix bool) erro
numRepos := 0 numRepos := 0
numPRs := 0 numPRs := 0
numPRsUpdated := 0 numPRsUpdated := 0
err := iterateRepositories(func(repo *repo_model.Repository) error { err := iterateRepositories(ctx, func(repo *repo_model.Repository) error {
numRepos++ numRepos++
return iteratePRs(repo, func(repo *repo_model.Repository, pr *models.PullRequest) error { return iteratePRs(ctx, repo, func(repo *repo_model.Repository, pr *models.PullRequest) error {
numPRs++ numPRs++
pr.BaseRepo = repo pr.BaseRepo = repo
repoPath := repo.RepoPath() repoPath := repo.RepoPath()

12
modules/doctor/misc.go
Unescape View File

@ -27,9 +27,9 @@ import (
"xorm.io/builder" "xorm.io/builder"
) )
func iterateRepositories(each func(*repo_model.Repository) error) error { func iterateRepositories(ctx context.Context, each func(*repo_model.Repository) error) error {
err := db.Iterate( err := db.Iterate(
db.DefaultContext, ctx,
new(repo_model.Repository), new(repo_model.Repository),
builder.Gt{"id": 0}, builder.Gt{"id": 0},
func(idx int, bean interface{}) error { func(idx int, bean interface{}) error {
@ -50,7 +50,7 @@ func checkScriptType(ctx context.Context, logger log.Logger, autofix bool) error
} }
func checkHooks(ctx context.Context, logger log.Logger, autofix bool) error { func checkHooks(ctx context.Context, logger log.Logger, autofix bool) error {
if err := iterateRepositories(func(repo *repo_model.Repository) error { if err := iterateRepositories(ctx, func(repo *repo_model.Repository) error {
results, err := repository.CheckDelegateHooks(repo.RepoPath()) results, err := repository.CheckDelegateHooks(repo.RepoPath())
if err != nil { if err != nil {
logger.Critical("Unable to check delegate hooks for repo %-v. ERROR: %v", repo, err) logger.Critical("Unable to check delegate hooks for repo %-v. ERROR: %v", repo, err)
@ -86,7 +86,7 @@ func checkEnablePushOptions(ctx context.Context, logger log.Logger, autofix bool
numRepos := 0 numRepos := 0
numNeedUpdate := 0 numNeedUpdate := 0
if err := iterateRepositories(func(repo *repo_model.Repository) error { if err := iterateRepositories(ctx, func(repo *repo_model.Repository) error {
numRepos++ numRepos++
r, err := git.OpenRepositoryCtx(git.DefaultContext, repo.RepoPath()) r, err := git.OpenRepositoryCtx(git.DefaultContext, repo.RepoPath())
if err != nil { if err != nil {
@ -132,13 +132,13 @@ func checkDaemonExport(ctx context.Context, logger log.Logger, autofix bool) err
logger.Critical("Unable to create cache: %v", err) logger.Critical("Unable to create cache: %v", err)
return err return err
} }
if err := iterateRepositories(func(repo *repo_model.Repository) error { if err := iterateRepositories(ctx, func(repo *repo_model.Repository) error {
numRepos++ numRepos++
if owner, has := cache.Get(repo.OwnerID); has { if owner, has := cache.Get(repo.OwnerID); has {
repo.Owner = owner.(*user_model.User) repo.Owner = owner.(*user_model.User)
} else { } else {
if err := repo.GetOwner(db.DefaultContext); err != nil { if err := repo.GetOwner(ctx); err != nil {
return err return err
} }
cache.Add(repo.OwnerID, repo.Owner) cache.Add(repo.OwnerID, repo.Owner)

2
modules/repository/repo.go
Unescape View File

@ -156,7 +156,7 @@ func MigrateRepositoryGitData(ctx context.Context, u *user_model.User,
} }
} }
if err = models.UpdateRepoSize(db.DefaultContext, repo); err != nil { if err = models.UpdateRepoSize(ctx, repo); err != nil {
log.Error("Failed to update size for repository: %v", err) log.Error("Failed to update size for repository: %v", err)
} }

3
modules/test/context_tests.go
Unescape View File

@ -14,7 +14,6 @@ import (
"testing" "testing"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unittest" "code.gitea.io/gitea/models/unittest"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
@ -87,7 +86,7 @@ func LoadUser(t *testing.T, ctx *context.Context, userID int64) {
// LoadGitRepo load a git repo into a test context. Requires that ctx.Repo has // LoadGitRepo load a git repo into a test context. Requires that ctx.Repo has
// already been populated. // already been populated.
func LoadGitRepo(t *testing.T, ctx *context.Context) { func LoadGitRepo(t *testing.T, ctx *context.Context) {
assert.NoError(t, ctx.Repo.Repository.GetOwner(db.DefaultContext)) assert.NoError(t, ctx.Repo.Repository.GetOwner(ctx))
var err error var err error
ctx.Repo.GitRepo, err = git.OpenRepositoryCtx(ctx, ctx.Repo.Repository.RepoPath()) ctx.Repo.GitRepo, err = git.OpenRepositoryCtx(ctx, ctx.Repo.Repository.RepoPath())
assert.NoError(t, err) assert.NoError(t, err)

2
routers/api/v1/org/org.go
Unescape View File

@ -346,7 +346,7 @@ func Edit(ctx *context.APIContext) {
if form.RepoAdminChangeTeamAccess != nil { if form.RepoAdminChangeTeamAccess != nil {
org.RepoAdminChangeTeamAccess = *form.RepoAdminChangeTeamAccess org.RepoAdminChangeTeamAccess = *form.RepoAdminChangeTeamAccess
} }
if err := user_model.UpdateUserCols(db.DefaultContext, org.AsUser(), if err := user_model.UpdateUserCols(ctx, org.AsUser(),
"full_name", "description", "website", "location", "full_name", "description", "website", "location",
"visibility", "repo_admin_change_team_access", "visibility", "repo_admin_change_team_access",
); err != nil { ); err != nil {

5
routers/api/v1/repo/issue_stopwatch.go
Unescape View File

@ -9,7 +9,6 @@ import (
"net/http" "net/http"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert" "code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/routers/api/v1/utils" "code.gitea.io/gitea/routers/api/v1/utils"
@ -56,7 +55,7 @@ func StartIssueStopwatch(ctx *context.APIContext) {
return return
} }
if err := models.CreateIssueStopwatch(db.DefaultContext, ctx.Doer, issue); err != nil { if err := models.CreateIssueStopwatch(ctx, ctx.Doer, issue); err != nil {
ctx.Error(http.StatusInternalServerError, "CreateOrStopIssueStopwatch", err) ctx.Error(http.StatusInternalServerError, "CreateOrStopIssueStopwatch", err)
return return
} }
@ -105,7 +104,7 @@ func StopIssueStopwatch(ctx *context.APIContext) {
return return
} }
if err := models.FinishIssueStopwatch(db.DefaultContext, ctx.Doer, issue); err != nil { if err := models.FinishIssueStopwatch(ctx, ctx.Doer, issue); err != nil {
ctx.Error(http.StatusInternalServerError, "CreateOrStopIssueStopwatch", err) ctx.Error(http.StatusInternalServerError, "CreateOrStopIssueStopwatch", err)
return return
} }

2
routers/api/v1/repo/key.go
Unescape View File

@ -87,7 +87,7 @@ func ListDeployKeys(ctx *context.APIContext) {
Fingerprint: ctx.FormString("fingerprint"), Fingerprint: ctx.FormString("fingerprint"),
} }
keys, err := asymkey_model.ListDeployKeys(db.DefaultContext, opts) keys, err := asymkey_model.ListDeployKeys(ctx, opts)
if err != nil { if err != nil {
ctx.InternalServerError(err) ctx.InternalServerError(err)
return return

2
routers/api/v1/repo/repo.go
Unescape View File

@ -217,7 +217,7 @@ func Search(ctx *context.APIContext) {
results := make([]*api.Repository, len(repos)) results := make([]*api.Repository, len(repos))
for i, repo := range repos { for i, repo := range repos {
if err = repo.GetOwner(db.DefaultContext); err != nil { if err = repo.GetOwner(ctx); err != nil {
ctx.JSON(http.StatusInternalServerError, api.SearchError{ ctx.JSON(http.StatusInternalServerError, api.SearchError{
OK: false, OK: false,
Error: err.Error(), Error: err.Error(),

2
routers/api/v1/user/gpg_key.go
Unescape View File

@ -18,7 +18,7 @@ import (
) )
func listGPGKeys(ctx *context.APIContext, uid int64, listOptions db.ListOptions) { func listGPGKeys(ctx *context.APIContext, uid int64, listOptions db.ListOptions) {
keys, err := asymkey_model.ListGPGKeys(db.DefaultContext, uid, listOptions) keys, err := asymkey_model.ListGPGKeys(ctx, uid, listOptions)
if err != nil { if err != nil {
ctx.Error(http.StatusInternalServerError, "ListGPGKeys", err) ctx.Error(http.StatusInternalServerError, "ListGPGKeys", err)
return return

3
routers/api/v1/user/repo.go
Unescape View File

@ -8,7 +8,6 @@ import (
"net/http" "net/http"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/models/perm"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
@ -124,7 +123,7 @@ func ListMyRepos(ctx *context.APIContext) {
results := make([]*api.Repository, len(repos)) results := make([]*api.Repository, len(repos))
for i, repo := range repos { for i, repo := range repos {
if err = repo.GetOwner(db.DefaultContext); err != nil { if err = repo.GetOwner(ctx); err != nil {
ctx.Error(http.StatusInternalServerError, "GetOwner", err) ctx.Error(http.StatusInternalServerError, "GetOwner", err)
return return
} }

3
routers/api/v1/utils/hook.go
Unescape View File

@ -9,7 +9,6 @@ import (
"net/http" "net/http"
"strings" "strings"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/models/webhook"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert" "code.gitea.io/gitea/modules/convert"
@ -164,7 +163,7 @@ func addHook(ctx *context.APIContext, form *api.CreateHookOption, orgID, repoID
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.Error(http.StatusInternalServerError, "UpdateEvent", err) ctx.Error(http.StatusInternalServerError, "UpdateEvent", err)
return nil, false return nil, false
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.Error(http.StatusInternalServerError, "CreateWebhook", err) ctx.Error(http.StatusInternalServerError, "CreateWebhook", err)
return nil, false return nil, false
} }

10
routers/web/auth/auth.go
Unescape View File

@ -107,7 +107,7 @@ func resetLocale(ctx *context.Context, u *user_model.User) error {
// If the user does not have a locale set, we save the current one. // If the user does not have a locale set, we save the current one.
if len(u.Language) == 0 { if len(u.Language) == 0 {
u.Language = ctx.Locale.Language() u.Language = ctx.Locale.Language()
if err := user_model.UpdateUserCols(db.DefaultContext, u, "language"); err != nil { if err := user_model.UpdateUserCols(ctx, u, "language"); err != nil {
return err return err
} }
} }
@ -333,7 +333,7 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember, obeyRe
// If the user does not have a locale set, we save the current one. // If the user does not have a locale set, we save the current one.
if len(u.Language) == 0 { if len(u.Language) == 0 {
u.Language = ctx.Locale.Language() u.Language = ctx.Locale.Language()
if err := user_model.UpdateUserCols(db.DefaultContext, u, "language"); err != nil { if err := user_model.UpdateUserCols(ctx, u, "language"); err != nil {
ctx.ServerError("UpdateUserCols Language", fmt.Errorf("Error updating user language [user: %d, locale: %s]", u.ID, u.Language)) ctx.ServerError("UpdateUserCols Language", fmt.Errorf("Error updating user language [user: %d, locale: %s]", u.ID, u.Language))
return setting.AppSubURL + "/" return setting.AppSubURL + "/"
} }
@ -350,7 +350,7 @@ func handleSignInFull(ctx *context.Context, u *user_model.User, remember, obeyRe
// Register last login // Register last login
u.SetLastLogin() u.SetLastLogin()
if err := user_model.UpdateUserCols(db.DefaultContext, u, "last_login_unix"); err != nil { if err := user_model.UpdateUserCols(ctx, u, "last_login_unix"); err != nil {
ctx.ServerError("UpdateUserCols", err) ctx.ServerError("UpdateUserCols", err)
return setting.AppSubURL + "/" return setting.AppSubURL + "/"
} }
@ -606,7 +606,7 @@ func handleUserCreated(ctx *context.Context, u *user_model.User, gothUser *goth.
u.IsAdmin = true u.IsAdmin = true
u.IsActive = true u.IsActive = true
u.SetLastLogin() u.SetLastLogin()
if err := user_model.UpdateUserCols(db.DefaultContext, u, "is_admin", "is_active", "last_login_unix"); err != nil { if err := user_model.UpdateUserCols(ctx, u, "is_admin", "is_active", "last_login_unix"); err != nil {
ctx.ServerError("UpdateUser", err) ctx.ServerError("UpdateUser", err)
return return
} }
@ -733,7 +733,7 @@ func handleAccountActivation(ctx *context.Context, user *user_model.User) {
ctx.ServerError("UpdateUser", err) ctx.ServerError("UpdateUser", err)
return return
} }
if err := user_model.UpdateUserCols(db.DefaultContext, user, "is_active", "rands"); err != nil { if err := user_model.UpdateUserCols(ctx, user, "is_active", "rands"); err != nil {
if user_model.IsErrUserNotExist(err) { if user_model.IsErrUserNotExist(err) {
ctx.NotFound("UpdateUserCols", err) ctx.NotFound("UpdateUserCols", err)
} else { } else {

5
routers/web/auth/oauth.go
Unescape View File

@ -16,7 +16,6 @@ import (
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/db"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
@ -1021,7 +1020,7 @@ func handleOAuth2SignIn(ctx *context.Context, source *auth.Source, u *user_model
cols = append(cols, "is_admin", "is_restricted") cols = append(cols, "is_admin", "is_restricted")
} }
if err := user_model.UpdateUserCols(db.DefaultContext, u, cols...); err != nil { if err := user_model.UpdateUserCols(ctx, u, cols...); err != nil {
ctx.ServerError("UpdateUserCols", err) ctx.ServerError("UpdateUserCols", err)
return return
} }
@ -1048,7 +1047,7 @@ func handleOAuth2SignIn(ctx *context.Context, source *auth.Source, u *user_model
changed := setUserGroupClaims(source, u, &gothUser) changed := setUserGroupClaims(source, u, &gothUser)
if changed { if changed {
if err := user_model.UpdateUserCols(db.DefaultContext, u, "is_admin", "is_restricted"); err != nil { if err := user_model.UpdateUserCols(ctx, u, "is_admin", "is_restricted"); err != nil {
ctx.ServerError("UpdateUserCols", err) ctx.ServerError("UpdateUserCols", err)
return return
} }

5
routers/web/auth/password.go
Unescape View File

@ -9,7 +9,6 @@ import (
"net/http" "net/http"
"code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/db"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
@ -232,7 +231,7 @@ func ResetPasswdPost(ctx *context.Context) {
return return
} }
u.MustChangePassword = false u.MustChangePassword = false
if err := user_model.UpdateUserCols(db.DefaultContext, u, "must_change_password", "passwd", "passwd_hash_algo", "rands", "salt"); err != nil { if err := user_model.UpdateUserCols(ctx, u, "must_change_password", "passwd", "passwd_hash_algo", "rands", "salt"); err != nil {
ctx.ServerError("UpdateUser", err) ctx.ServerError("UpdateUser", err)
return return
} }
@ -327,7 +326,7 @@ func MustChangePasswordPost(ctx *context.Context) {
u.MustChangePassword = false u.MustChangePassword = false
if err := user_model.UpdateUserCols(db.DefaultContext, u, "must_change_password", "passwd", "passwd_hash_algo", "salt"); err != nil { if err := user_model.UpdateUserCols(ctx, u, "must_change_password", "passwd", "passwd_hash_algo", "salt"); err != nil {
ctx.ServerError("UpdateUser", err) ctx.ServerError("UpdateUser", err)
return return
} }

2
routers/web/org/org_labels.go
Unescape View File

@ -100,7 +100,7 @@ func InitializeLabels(ctx *context.Context) {
return return
} }
if err := models.InitializeLabels(db.DefaultContext, ctx.Org.Organization.ID, form.TemplateName, true); err != nil { if err := models.InitializeLabels(ctx, ctx.Org.Organization.ID, form.TemplateName, true); err != nil {
if models.IsErrIssueLabelTemplateLoad(err) { if models.IsErrIssueLabelTemplateLoad(err) {
originalErr := err.(models.ErrIssueLabelTemplateLoad).OriginalError originalErr := err.(models.ErrIssueLabelTemplateLoad).OriginalError
ctx.Flash.Error(ctx.Tr("repo.issues.label_templates.fail_to_load_file", form.TemplateName, originalErr)) ctx.Flash.Error(ctx.Tr("repo.issues.label_templates.fail_to_load_file", form.TemplateName, originalErr))

3
routers/web/repo/compare.go
Unescape View File

@ -18,7 +18,6 @@ import (
"strings" "strings"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
@ -269,7 +268,7 @@ func ParseCompareInfo(ctx *context.Context) *CompareInfo {
} }
return nil return nil
} }
if err := ci.HeadRepo.GetOwner(db.DefaultContext); err != nil { if err := ci.HeadRepo.GetOwner(ctx); err != nil {
if user_model.IsErrUserNotExist(err) { if user_model.IsErrUserNotExist(err) {
ctx.NotFound("GetUserByName", nil) ctx.NotFound("GetUserByName", nil)
} else { } else {

3
routers/web/repo/http.go
Unescape View File

@ -21,7 +21,6 @@ import (
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/auth" "code.gitea.io/gitea/models/auth"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/models/perm"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unit"
@ -159,7 +158,7 @@ func httpBase(ctx *context.Context) (h *serviceHandler) {
// don't allow anonymous pulls if organization is not public // don't allow anonymous pulls if organization is not public
if isPublicPull { if isPublicPull {
if err := repo.GetOwner(db.DefaultContext); err != nil { if err := repo.GetOwner(ctx); err != nil {
ctx.ServerError("GetOwner", err) ctx.ServerError("GetOwner", err)
return return
} }

2
routers/web/repo/issue.go
Unescape View File

@ -1944,7 +1944,7 @@ func UpdatePullReviewRequest(ctx *context.Context) {
} }
if reviewID < 0 { if reviewID < 0 {
// negative reviewIDs represent team requests // negative reviewIDs represent team requests
if err := issue.Repo.GetOwner(db.DefaultContext); err != nil { if err := issue.Repo.GetOwner(ctx); err != nil {
ctx.ServerError("issue.Repo.GetOwner", err) ctx.ServerError("issue.Repo.GetOwner", err)
return return
} }

11
routers/web/repo/issue_content_history.go
Unescape View File

@ -12,7 +12,6 @@ import (
"strings" "strings"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
issuesModel "code.gitea.io/gitea/models/issues" issuesModel "code.gitea.io/gitea/models/issues"
"code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unit"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
@ -32,7 +31,7 @@ func GetContentHistoryOverview(ctx *context.Context) {
} }
lang := ctx.Locale.Language() lang := ctx.Locale.Language()
editedHistoryCountMap, _ := issuesModel.QueryIssueContentHistoryEditedCountMap(db.DefaultContext, issue.ID) editedHistoryCountMap, _ := issuesModel.QueryIssueContentHistoryEditedCountMap(ctx, issue.ID)
ctx.JSON(http.StatusOK, map[string]interface{}{ ctx.JSON(http.StatusOK, map[string]interface{}{
"i18n": map[string]interface{}{ "i18n": map[string]interface{}{
"textEdited": i18n.Tr(lang, "repo.issues.content_history.edited"), "textEdited": i18n.Tr(lang, "repo.issues.content_history.edited"),
@ -52,7 +51,7 @@ func GetContentHistoryList(ctx *context.Context) {
return return
} }
items, _ := issuesModel.FetchIssueContentHistoryList(db.DefaultContext, issue.ID, commentID) items, _ := issuesModel.FetchIssueContentHistoryList(ctx, issue.ID, commentID)
// render history list to HTML for frontend dropdown items: (name, value) // render history list to HTML for frontend dropdown items: (name, value)
// name is HTML of "avatar + userName + userAction + timeSince" // name is HTML of "avatar + userName + userAction + timeSince"
@ -119,7 +118,7 @@ func GetContentHistoryDetail(ctx *context.Context) {
} }
historyID := ctx.FormInt64("history_id") historyID := ctx.FormInt64("history_id")
history, prevHistory, err := issuesModel.GetIssueContentHistoryAndPrev(db.DefaultContext, historyID) history, prevHistory, err := issuesModel.GetIssueContentHistoryAndPrev(ctx, historyID)
if err != nil { if err != nil {
ctx.JSON(http.StatusNotFound, map[string]interface{}{ ctx.JSON(http.StatusNotFound, map[string]interface{}{
"message": "Can not find the content history", "message": "Can not find the content history",
@ -196,7 +195,7 @@ func SoftDeleteContentHistory(ctx *context.Context) {
return return
} }
} }
if history, err = issuesModel.GetIssueContentHistoryByID(db.DefaultContext, historyID); err != nil { if history, err = issuesModel.GetIssueContentHistoryByID(ctx, historyID); err != nil {
log.Error("can not get issue content history %v. err=%v", historyID, err) log.Error("can not get issue content history %v. err=%v", historyID, err)
return return
} }
@ -209,7 +208,7 @@ func SoftDeleteContentHistory(ctx *context.Context) {
return return
} }
err = issuesModel.SoftDeleteIssueContentHistory(db.DefaultContext, historyID) err = issuesModel.SoftDeleteIssueContentHistory(ctx, historyID)
log.Debug("soft delete issue content history. issue=%d, comment=%d, history=%d", issue.ID, commentID, historyID) log.Debug("soft delete issue content history. issue=%d, comment=%d, history=%d", issue.ID, commentID, historyID)
ctx.JSON(http.StatusOK, map[string]interface{}{ ctx.JSON(http.StatusOK, map[string]interface{}{
"ok": err == nil, "ok": err == nil,

2
routers/web/repo/issue_label.go
Unescape View File

@ -39,7 +39,7 @@ func InitializeLabels(ctx *context.Context) {
return return
} }
if err := models.InitializeLabels(db.DefaultContext, ctx.Repo.Repository.ID, form.TemplateName, false); err != nil { if err := models.InitializeLabels(ctx, ctx.Repo.Repository.ID, form.TemplateName, false); err != nil {
if models.IsErrIssueLabelTemplateLoad(err) { if models.IsErrIssueLabelTemplateLoad(err) {
originalErr := err.(models.ErrIssueLabelTemplateLoad).OriginalError originalErr := err.(models.ErrIssueLabelTemplateLoad).OriginalError
ctx.Flash.Error(ctx.Tr("repo.issues.label_templates.fail_to_load_file", form.TemplateName, originalErr)) ctx.Flash.Error(ctx.Tr("repo.issues.label_templates.fail_to_load_file", form.TemplateName, originalErr))

4
routers/web/repo/pull.go
Unescape View File

@ -99,7 +99,7 @@ func getForkRepository(ctx *context.Context) *repo_model.Repository {
return nil return nil
} }
if err := forkRepo.GetOwner(db.DefaultContext); err != nil { if err := forkRepo.GetOwner(ctx); err != nil {
ctx.ServerError("GetOwner", err) ctx.ServerError("GetOwner", err)
return nil return nil
} }
@ -1255,7 +1255,7 @@ func CleanUpPullRequest(ctx *context.Context) {
} else if err = pr.LoadBaseRepo(); err != nil { } else if err = pr.LoadBaseRepo(); err != nil {
ctx.ServerError("LoadBaseRepo", err) ctx.ServerError("LoadBaseRepo", err)
return return
} else if err = pr.HeadRepo.GetOwner(db.DefaultContext); err != nil { } else if err = pr.HeadRepo.GetOwner(ctx); err != nil {
ctx.ServerError("HeadRepo.GetOwner", err) ctx.ServerError("HeadRepo.GetOwner", err)
return return
} }

8
routers/web/repo/repo.go
Unescape View File

@ -353,7 +353,7 @@ func RedirectDownload(ctx *context.Context) {
) )
tagNames := []string{vTag} tagNames := []string{vTag}
curRepo := ctx.Repo.Repository curRepo := ctx.Repo.Repository
releases, err := models.GetReleasesByRepoIDAndNames(db.DefaultContext, curRepo.ID, tagNames) releases, err := models.GetReleasesByRepoIDAndNames(ctx, curRepo.ID, tagNames)
if err != nil { if err != nil {
if repo_model.IsErrAttachmentNotExist(err) { if repo_model.IsErrAttachmentNotExist(err) {
ctx.Error(http.StatusNotFound) ctx.Error(http.StatusNotFound)
@ -394,7 +394,7 @@ func Download(ctx *context.Context) {
return return
} }
archiver, err := repo_model.GetRepoArchiver(db.DefaultContext, aReq.RepoID, aReq.Type, aReq.CommitID) archiver, err := repo_model.GetRepoArchiver(ctx, aReq.RepoID, aReq.Type, aReq.CommitID)
if err != nil { if err != nil {
ctx.ServerError("models.GetRepoArchiver", err) ctx.ServerError("models.GetRepoArchiver", err)
return return
@ -424,7 +424,7 @@ func Download(ctx *context.Context) {
return return
} }
times++ times++
archiver, err = repo_model.GetRepoArchiver(db.DefaultContext, aReq.RepoID, aReq.Type, aReq.CommitID) archiver, err = repo_model.GetRepoArchiver(ctx, aReq.RepoID, aReq.Type, aReq.CommitID)
if err != nil { if err != nil {
ctx.ServerError("archiver_service.StartArchive", err) ctx.ServerError("archiver_service.StartArchive", err)
return return
@ -480,7 +480,7 @@ func InitiateDownload(ctx *context.Context) {
return return
} }
archiver, err := repo_model.GetRepoArchiver(db.DefaultContext, aReq.RepoID, aReq.Type, aReq.CommitID) archiver, err := repo_model.GetRepoArchiver(ctx, aReq.RepoID, aReq.Type, aReq.CommitID)
if err != nil { if err != nil {
ctx.ServerError("archiver_service.StartArchive", err) ctx.ServerError("archiver_service.StartArchive", err)
return return

6
routers/web/repo/setting.go
Unescape View File

@ -595,7 +595,7 @@ func SettingsPost(ctx *context.Context) {
ctx.Error(http.StatusNotFound) ctx.Error(http.StatusNotFound)
return return
} }
if err := repo.GetOwner(db.DefaultContext); err != nil { if err := repo.GetOwner(ctx); err != nil {
ctx.ServerError("Convert Fork", err) ctx.ServerError("Convert Fork", err)
return return
} }
@ -1055,7 +1055,7 @@ func DeployKeys(ctx *context.Context) {
ctx.Data["PageIsSettingsKeys"] = true ctx.Data["PageIsSettingsKeys"] = true
ctx.Data["DisableSSH"] = setting.SSH.Disabled ctx.Data["DisableSSH"] = setting.SSH.Disabled
keys, err := asymkey_model.ListDeployKeys(db.DefaultContext, &asymkey_model.ListDeployKeysOptions{RepoID: ctx.Repo.Repository.ID}) keys, err := asymkey_model.ListDeployKeys(ctx, &asymkey_model.ListDeployKeysOptions{RepoID: ctx.Repo.Repository.ID})
if err != nil { if err != nil {
ctx.ServerError("ListDeployKeys", err) ctx.ServerError("ListDeployKeys", err)
return return
@ -1071,7 +1071,7 @@ func DeployKeysPost(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("repo.settings.deploy_keys") ctx.Data["Title"] = ctx.Tr("repo.settings.deploy_keys")
ctx.Data["PageIsSettingsKeys"] = true ctx.Data["PageIsSettingsKeys"] = true
keys, err := asymkey_model.ListDeployKeys(db.DefaultContext, &asymkey_model.ListDeployKeysOptions{RepoID: ctx.Repo.Repository.ID}) keys, err := asymkey_model.ListDeployKeys(ctx, &asymkey_model.ListDeployKeysOptions{RepoID: ctx.Repo.Repository.ID})
if err != nil { if err != nil {
ctx.ServerError("ListDeployKeys", err) ctx.ServerError("ListDeployKeys", err)
return return

4
routers/web/repo/view.go
Unescape View File

@ -884,7 +884,7 @@ func renderCode(ctx *context.Context) {
ctx.ServerError("UpdateRepositoryCols", err) ctx.ServerError("UpdateRepositoryCols", err)
return return
} }
if err = models.UpdateRepoSize(db.DefaultContext, ctx.Repo.Repository); err != nil { if err = models.UpdateRepoSize(ctx, ctx.Repo.Repository); err != nil {
ctx.ServerError("UpdateRepoSize", err) ctx.ServerError("UpdateRepoSize", err)
return return
} }
@ -1017,7 +1017,7 @@ func Forks(ctx *context.Context) {
} }
for _, fork := range forks { for _, fork := range forks {
if err = fork.GetOwner(db.DefaultContext); err != nil { if err = fork.GetOwner(ctx); err != nil {
ctx.ServerError("GetOwner", err) ctx.ServerError("GetOwner", err)
return return
} }

23
routers/web/repo/webhook.go
Unescape View File

@ -13,7 +13,6 @@ import (
"path" "path"
"strings" "strings"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/models/perm"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/models/webhook" "code.gitea.io/gitea/models/webhook"
@ -227,7 +226,7 @@ func GiteaHooksNewPost(ctx *context.Context) {
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.ServerError("UpdateEvent", err) ctx.ServerError("UpdateEvent", err)
return return
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.ServerError("CreateWebhook", err) ctx.ServerError("CreateWebhook", err)
return return
} }
@ -281,7 +280,7 @@ func newGogsWebhookPost(ctx *context.Context, form forms.NewGogshookForm, kind w
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.ServerError("UpdateEvent", err) ctx.ServerError("UpdateEvent", err)
return return
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.ServerError("CreateWebhook", err) ctx.ServerError("CreateWebhook", err)
return return
} }
@ -333,7 +332,7 @@ func DiscordHooksNewPost(ctx *context.Context) {
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.ServerError("UpdateEvent", err) ctx.ServerError("UpdateEvent", err)
return return
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.ServerError("CreateWebhook", err) ctx.ServerError("CreateWebhook", err)
return return
} }
@ -376,7 +375,7 @@ func DingtalkHooksNewPost(ctx *context.Context) {
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.ServerError("UpdateEvent", err) ctx.ServerError("UpdateEvent", err)
return return
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.ServerError("CreateWebhook", err) ctx.ServerError("CreateWebhook", err)
return return
} }
@ -428,7 +427,7 @@ func TelegramHooksNewPost(ctx *context.Context) {
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.ServerError("UpdateEvent", err) ctx.ServerError("UpdateEvent", err)
return return
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.ServerError("CreateWebhook", err) ctx.ServerError("CreateWebhook", err)
return return
} }
@ -483,7 +482,7 @@ func MatrixHooksNewPost(ctx *context.Context) {
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.ServerError("UpdateEvent", err) ctx.ServerError("UpdateEvent", err)
return return
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.ServerError("CreateWebhook", err) ctx.ServerError("CreateWebhook", err)
return return
} }
@ -526,7 +525,7 @@ func MSTeamsHooksNewPost(ctx *context.Context) {
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.ServerError("UpdateEvent", err) ctx.ServerError("UpdateEvent", err)
return return
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.ServerError("CreateWebhook", err) ctx.ServerError("CreateWebhook", err)
return return
} }
@ -586,7 +585,7 @@ func SlackHooksNewPost(ctx *context.Context) {
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.ServerError("UpdateEvent", err) ctx.ServerError("UpdateEvent", err)
return return
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.ServerError("CreateWebhook", err) ctx.ServerError("CreateWebhook", err)
return return
} }
@ -629,7 +628,7 @@ func FeishuHooksNewPost(ctx *context.Context) {
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.ServerError("UpdateEvent", err) ctx.ServerError("UpdateEvent", err)
return return
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.ServerError("CreateWebhook", err) ctx.ServerError("CreateWebhook", err)
return return
} }
@ -673,7 +672,7 @@ func WechatworkHooksNewPost(ctx *context.Context) {
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.ServerError("UpdateEvent", err) ctx.ServerError("UpdateEvent", err)
return return
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.ServerError("CreateWebhook", err) ctx.ServerError("CreateWebhook", err)
return return
} }
@ -726,7 +725,7 @@ func PackagistHooksNewPost(ctx *context.Context) {
if err := w.UpdateEvent(); err != nil { if err := w.UpdateEvent(); err != nil {
ctx.ServerError("UpdateEvent", err) ctx.ServerError("UpdateEvent", err)
return return
} else if err := webhook.CreateWebhook(db.DefaultContext, w); err != nil { } else if err := webhook.CreateWebhook(ctx, w); err != nil {
ctx.ServerError("CreateWebhook", err) ctx.ServerError("CreateWebhook", err)
return return
} }

4
routers/web/user/home.go
Unescape View File

@ -74,7 +74,7 @@ func Dashboard(ctx *context.Context) {
ctx.Data["Title"] = ctxUser.DisplayName() + " - " + ctx.Tr("dashboard") ctx.Data["Title"] = ctxUser.DisplayName() + " - " + ctx.Tr("dashboard")
ctx.Data["PageIsDashboard"] = true ctx.Data["PageIsDashboard"] = true
ctx.Data["PageIsNews"] = true ctx.Data["PageIsNews"] = true
cnt, _ := models.GetOrganizationCount(db.DefaultContext, ctxUser) cnt, _ := models.GetOrganizationCount(ctx, ctxUser)
ctx.Data["UserOrgsCount"] = cnt ctx.Data["UserOrgsCount"] = cnt
var uid int64 var uid int64
@ -730,7 +730,7 @@ func ShowSSHKeys(ctx *context.Context, uid int64) {
// ShowGPGKeys output all the public GPG keys of user by uid // ShowGPGKeys output all the public GPG keys of user by uid
func ShowGPGKeys(ctx *context.Context, uid int64) { func ShowGPGKeys(ctx *context.Context, uid int64) {
keys, err := asymkey_model.ListGPGKeys(db.DefaultContext, uid, db.ListOptions{}) keys, err := asymkey_model.ListGPGKeys(ctx, uid, db.ListOptions{})
if err != nil { if err != nil {
ctx.ServerError("ListGPGKeys", err) ctx.ServerError("ListGPGKeys", err)
return return

3
routers/web/user/setting/account.go
Unescape View File

@ -11,7 +11,6 @@ import (
"time" "time"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/base"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
@ -75,7 +74,7 @@ func AccountPost(ctx *context.Context) {
ctx.ServerError("UpdateUser", err) ctx.ServerError("UpdateUser", err)
return return
} }
if err := user_model.UpdateUserCols(db.DefaultContext, ctx.Doer, "salt", "passwd_hash_algo", "passwd"); err != nil { if err := user_model.UpdateUserCols(ctx, ctx.Doer, "salt", "passwd_hash_algo", "passwd"); err != nil {
ctx.ServerError("UpdateUser", err) ctx.ServerError("UpdateUser", err)
return return
} }

2
routers/web/user/setting/keys.go
Unescape View File

@ -269,7 +269,7 @@ func loadKeysData(ctx *context.Context) {
} }
ctx.Data["ExternalKeys"] = externalKeys ctx.Data["ExternalKeys"] = externalKeys
gpgkeys, err := asymkey_model.ListGPGKeys(db.DefaultContext, ctx.Doer.ID, db.ListOptions{}) gpgkeys, err := asymkey_model.ListGPGKeys(ctx, ctx.Doer.ID, db.ListOptions{})
if err != nil { if err != nil {
ctx.ServerError("ListGPGKeys", err) ctx.ServerError("ListGPGKeys", err)
return return

2
routers/web/user/setting/profile.go
Unescape View File

@ -185,7 +185,7 @@ func UpdateAvatarSetting(ctx *context.Context, form *forms.AvatarForm, ctxUser *
} }
} }
if err := user_model.UpdateUserCols(db.DefaultContext, ctxUser, "avatar", "avatar_email", "use_custom_avatar"); err != nil { if err := user_model.UpdateUserCols(ctx, ctxUser, "avatar", "avatar_email", "use_custom_avatar"); err != nil {
return fmt.Errorf("UpdateUser: %v", err) return fmt.Errorf("UpdateUser: %v", err)
} }

8
services/asymkey/sign.go
Unescape View File

@ -143,7 +143,7 @@ Loop:
case always: case always:
break Loop break Loop
case pubkey: case pubkey:
keys, err := asymkey_model.ListGPGKeys(db.DefaultContext, u.ID, db.ListOptions{}) keys, err := asymkey_model.ListGPGKeys(ctx, u.ID, db.ListOptions{})
if err != nil { if err != nil {
return false, "", nil, err return false, "", nil, err
} }
@ -179,7 +179,7 @@ Loop:
case always: case always:
break Loop break Loop
case pubkey: case pubkey:
keys, err := asymkey_model.ListGPGKeys(db.DefaultContext, u.ID, db.ListOptions{}) keys, err := asymkey_model.ListGPGKeys(ctx, u.ID, db.ListOptions{})
if err != nil { if err != nil {
return false, "", nil, err return false, "", nil, err
} }
@ -232,7 +232,7 @@ Loop:
case always: case always:
break Loop break Loop
case pubkey: case pubkey:
keys, err := asymkey_model.ListGPGKeys(db.DefaultContext, u.ID, db.ListOptions{}) keys, err := asymkey_model.ListGPGKeys(ctx, u.ID, db.ListOptions{})
if err != nil { if err != nil {
return false, "", nil, err return false, "", nil, err
} }
@ -294,7 +294,7 @@ Loop:
case always: case always:
break Loop break Loop
case pubkey: case pubkey:
keys, err := asymkey_model.ListGPGKeys(db.DefaultContext, u.ID, db.ListOptions{}) keys, err := asymkey_model.ListGPGKeys(ctx, u.ID, db.ListOptions{})
if err != nil { if err != nil {
return false, "", nil, err return false, "", nil, err
} }

2
services/auth/source/ldap/source_sync.go
Unescape View File

@ -202,7 +202,7 @@ func (source *Source) Sync(ctx context.Context, updateExisting bool) error {
log.Trace("SyncExternalUsers[%s]: Deactivating user %s", source.authSource.Name, usr.Name) log.Trace("SyncExternalUsers[%s]: Deactivating user %s", source.authSource.Name, usr.Name)
usr.IsActive = false usr.IsActive = false
err = user_model.UpdateUserCols(db.DefaultContext, usr, "is_active") err = user_model.UpdateUserCols(ctx, usr, "is_active")
if err != nil { if err != nil {
log.Error("SyncExternalUsers[%s]: Error deactivating user %s: %v", source.authSource.Name, usr.Name, err) log.Error("SyncExternalUsers[%s]: Error deactivating user %s: %v", source.authSource.Name, usr.Name, err)
} }

2
services/mailer/mail.go
Unescape View File

@ -7,6 +7,7 @@ package mailer
import ( import (
"bytes" "bytes"
"context"
"fmt" "fmt"
"html/template" "html/template"
"mime" "mime"
@ -414,6 +415,7 @@ func SendIssueAssignedMail(issue *models.Issue, doer *user_model.User, content s
for lang, tos := range langMap { for lang, tos := range langMap {
msgs, err := composeIssueCommentMessages(&mailCommentContext{ msgs, err := composeIssueCommentMessages(&mailCommentContext{
Context: context.TODO(), // TODO: use a correct context
Issue: issue, Issue: issue,
Doer: doer, Doer: doer,
ActionType: models.ActionType(0), ActionType: models.ActionType(0),

4
services/mailer/mail_issue.go
Unescape View File

@ -9,7 +9,6 @@ import (
"fmt" "fmt"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
@ -81,7 +80,7 @@ func mailIssueCommentToParticipants(ctx *mailCommentContext, mentions []*user_mo
// =========== Repo watchers =========== // =========== Repo watchers ===========
// Make repo watchers last, since it's likely the list with the most users // Make repo watchers last, since it's likely the list with the most users
if !(ctx.Issue.IsPull && ctx.Issue.PullRequest.IsWorkInProgress() && ctx.ActionType != models.ActionCreatePullRequest) { if !(ctx.Issue.IsPull && ctx.Issue.PullRequest.IsWorkInProgress() && ctx.ActionType != models.ActionCreatePullRequest) {
ids, err = repo_model.GetRepoWatchersIDs(db.DefaultContext, ctx.Issue.RepoID) ids, err = repo_model.GetRepoWatchersIDs(ctx, ctx.Issue.RepoID)
if err != nil { if err != nil {
return fmt.Errorf("GetRepoWatchersIDs(%d): %v", ctx.Issue.RepoID, err) return fmt.Errorf("GetRepoWatchersIDs(%d): %v", ctx.Issue.RepoID, err)
} }
@ -186,6 +185,7 @@ func MailParticipants(issue *models.Issue, doer *user_model.User, opType models.
} }
if err := mailIssueCommentToParticipants( if err := mailIssueCommentToParticipants(
&mailCommentContext{ &mailCommentContext{
Context: context.TODO(), // TODO: use a correct context
Issue: issue, Issue: issue,
Doer: doer, Doer: doer,
ActionType: opType, ActionType: opType,

3
services/mailer/mail_release.go
Unescape View File

@ -9,7 +9,6 @@ import (
"context" "context"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
"code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/base"
@ -32,7 +31,7 @@ func MailNewRelease(ctx context.Context, rel *models.Release) {
return return
} }
watcherIDList, err := repo_model.GetRepoWatchersIDs(db.DefaultContext, rel.RepoID) watcherIDList, err := repo_model.GetRepoWatchersIDs(ctx, rel.RepoID)
if err != nil { if err != nil {
log.Error("GetRepoWatchersIDs(%d): %v", rel.RepoID, err) log.Error("GetRepoWatchersIDs(%d): %v", rel.RepoID, err)
return return

10
services/mailer/mail_test.go
Unescape View File

@ -6,6 +6,7 @@ package mailer
import ( import (
"bytes" "bytes"
"context"
"fmt" "fmt"
"html/template" "html/template"
"strings" "strings"
@ -70,6 +71,7 @@ func TestComposeIssueCommentMessage(t *testing.T) {
recipients := []*user_model.User{{Name: "Test", Email: "test@gitea.com"}, {Name: "Test2", Email: "test2@gitea.com"}} recipients := []*user_model.User{{Name: "Test", Email: "test@gitea.com"}, {Name: "Test2", Email: "test2@gitea.com"}}
msgs, err := composeIssueCommentMessages(&mailCommentContext{ msgs, err := composeIssueCommentMessages(&mailCommentContext{
Context: context.TODO(), // TODO: use a correct context
Issue: issue, Doer: doer, ActionType: models.ActionCommentIssue, Issue: issue, Doer: doer, ActionType: models.ActionCommentIssue,
Content: "test body", Comment: comment, Content: "test body", Comment: comment,
}, "en-US", recipients, false, "issue comment") }, "en-US", recipients, false, "issue comment")
@ -99,6 +101,7 @@ func TestComposeIssueMessage(t *testing.T) {
recipients := []*user_model.User{{Name: "Test", Email: "test@gitea.com"}, {Name: "Test2", Email: "test2@gitea.com"}} recipients := []*user_model.User{{Name: "Test", Email: "test@gitea.com"}, {Name: "Test2", Email: "test2@gitea.com"}}
msgs, err := composeIssueCommentMessages(&mailCommentContext{ msgs, err := composeIssueCommentMessages(&mailCommentContext{
Context: context.TODO(), // TODO: use a correct context
Issue: issue, Doer: doer, ActionType: models.ActionCreateIssue, Issue: issue, Doer: doer, ActionType: models.ActionCreateIssue,
Content: "test body", Content: "test body",
}, "en-US", recipients, false, "issue create") }, "en-US", recipients, false, "issue create")
@ -145,12 +148,14 @@ func TestTemplateSelection(t *testing.T) {
} }
msg := testComposeIssueCommentMessage(t, &mailCommentContext{ msg := testComposeIssueCommentMessage(t, &mailCommentContext{
Context: context.TODO(), // TODO: use a correct context
Issue: issue, Doer: doer, ActionType: models.ActionCreateIssue, Issue: issue, Doer: doer, ActionType: models.ActionCreateIssue,
Content: "test body", Content: "test body",
}, recipients, false, "TestTemplateSelection") }, recipients, false, "TestTemplateSelection")
expect(t, msg, "issue/new/subject", "issue/new/body") expect(t, msg, "issue/new/subject", "issue/new/body")
msg = testComposeIssueCommentMessage(t, &mailCommentContext{ msg = testComposeIssueCommentMessage(t, &mailCommentContext{
Context: context.TODO(), // TODO: use a correct context
Issue: issue, Doer: doer, ActionType: models.ActionCommentIssue, Issue: issue, Doer: doer, ActionType: models.ActionCommentIssue,
Content: "test body", Comment: comment, Content: "test body", Comment: comment,
}, recipients, false, "TestTemplateSelection") }, recipients, false, "TestTemplateSelection")
@ -159,12 +164,14 @@ func TestTemplateSelection(t *testing.T) {
pull := unittest.AssertExistsAndLoadBean(t, &models.Issue{ID: 2, Repo: repo, Poster: doer}).(*models.Issue) pull := unittest.AssertExistsAndLoadBean(t, &models.Issue{ID: 2, Repo: repo, Poster: doer}).(*models.Issue)
comment = unittest.AssertExistsAndLoadBean(t, &models.Comment{ID: 4, Issue: pull}).(*models.Comment) comment = unittest.AssertExistsAndLoadBean(t, &models.Comment{ID: 4, Issue: pull}).(*models.Comment)
msg = testComposeIssueCommentMessage(t, &mailCommentContext{ msg = testComposeIssueCommentMessage(t, &mailCommentContext{
Context: context.TODO(), // TODO: use a correct context
Issue: pull, Doer: doer, ActionType: models.ActionCommentPull, Issue: pull, Doer: doer, ActionType: models.ActionCommentPull,
Content: "test body", Comment: comment, Content: "test body", Comment: comment,
}, recipients, false, "TestTemplateSelection") }, recipients, false, "TestTemplateSelection")
expect(t, msg, "pull/comment/subject", "pull/comment/body") expect(t, msg, "pull/comment/subject", "pull/comment/body")
msg = testComposeIssueCommentMessage(t, &mailCommentContext{ msg = testComposeIssueCommentMessage(t, &mailCommentContext{
Context: context.TODO(), // TODO: use a correct context
Issue: issue, Doer: doer, ActionType: models.ActionCloseIssue, Issue: issue, Doer: doer, ActionType: models.ActionCloseIssue,
Content: "test body", Comment: comment, Content: "test body", Comment: comment,
}, recipients, false, "TestTemplateSelection") }, recipients, false, "TestTemplateSelection")
@ -184,6 +191,7 @@ func TestTemplateServices(t *testing.T) {
recipients := []*user_model.User{{Name: "Test", Email: "test@gitea.com"}} recipients := []*user_model.User{{Name: "Test", Email: "test@gitea.com"}}
msg := testComposeIssueCommentMessage(t, &mailCommentContext{ msg := testComposeIssueCommentMessage(t, &mailCommentContext{
Context: context.TODO(), // TODO: use a correct context
Issue: issue, Doer: doer, ActionType: actionType, Issue: issue, Doer: doer, ActionType: actionType,
Content: "test body", Comment: comment, Content: "test body", Comment: comment,
}, recipients, fromMention, "TestTemplateServices") }, recipients, fromMention, "TestTemplateServices")
@ -226,7 +234,7 @@ func testComposeIssueCommentMessage(t *testing.T, ctx *mailCommentContext, recip
func TestGenerateAdditionalHeaders(t *testing.T) { func TestGenerateAdditionalHeaders(t *testing.T) {
doer, _, issue, _ := prepareMailerTest(t) doer, _, issue, _ := prepareMailerTest(t)
ctx := &mailCommentContext{Issue: issue, Doer: doer} ctx := &mailCommentContext{Context: context.TODO() /* TODO: use a correct context */, Issue: issue, Doer: doer}
recipient := &user_model.User{Name: "Test", Email: "test@gitea.com"} recipient := &user_model.User{Name: "Test", Email: "test@gitea.com"}
headers := generateAdditionalHeaders(ctx, "dummy-reason", recipient) headers := generateAdditionalHeaders(ctx, "dummy-reason", recipient)

2
services/migrations/gitea_uploader.go
Unescape View File

@ -817,7 +817,7 @@ func (g *GiteaLocalUploader) Finish() error {
return err return err
} }
if err := models.UpdateRepoStats(db.DefaultContext, g.repo.ID); err != nil { if err := models.UpdateRepoStats(g.ctx, g.repo.ID); err != nil {
return err return err
} }

3
services/mirror/mirror_pull.go
Unescape View File

@ -12,7 +12,6 @@ import (
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
admin_model "code.gitea.io/gitea/models/admin" admin_model "code.gitea.io/gitea/models/admin"
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/modules/cache" "code.gitea.io/gitea/modules/cache"
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
@ -287,7 +286,7 @@ func runSync(ctx context.Context, m *repo_model.Mirror) ([]*mirrorSyncResult, bo
gitRepo.Close() gitRepo.Close()
log.Trace("SyncMirrors [repo: %-v]: updating size of repository", m.Repo) log.Trace("SyncMirrors [repo: %-v]: updating size of repository", m.Repo)
if err := models.UpdateRepoSize(db.DefaultContext, m.Repo); err != nil { if err := models.UpdateRepoSize(ctx, m.Repo); err != nil {
log.Error("SyncMirrors [repo: %-v]: failed to update size for mirror repository: %v", m.Repo, err) log.Error("SyncMirrors [repo: %-v]: failed to update size for mirror repository: %v", m.Repo, err)
} }

3
services/pull/check.go
Unescape View File

@ -13,7 +13,6 @@ import (
"strings" "strings"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
@ -168,7 +167,7 @@ func manuallyMerged(ctx context.Context, pr *models.PullRequest) bool {
// When the commit author is unknown set the BaseRepo owner as merger // When the commit author is unknown set the BaseRepo owner as merger
if merger == nil { if merger == nil {
if pr.BaseRepo.Owner == nil { if pr.BaseRepo.Owner == nil {
if err = pr.BaseRepo.GetOwner(db.DefaultContext); err != nil { if err = pr.BaseRepo.GetOwner(ctx); err != nil {
log.Error("BaseRepo.GetOwner[%d]: %v", pr.ID, err) log.Error("BaseRepo.GetOwner[%d]: %v", pr.ID, err)
return false return false
} }

5
services/pull/merge.go
Unescape View File

@ -17,7 +17,6 @@ import (
"time" "time"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/models/unit"
user_model "code.gitea.io/gitea/models/user" user_model "code.gitea.io/gitea/models/user"
@ -80,7 +79,7 @@ func Merge(ctx context.Context, pr *models.PullRequest, doer *user_model.User, b
if err := pr.Issue.LoadRepo(); err != nil { if err := pr.Issue.LoadRepo(); err != nil {
log.Error("loadRepo for issue [%d]: %v", pr.ID, err) log.Error("loadRepo for issue [%d]: %v", pr.ID, err)
} }
if err := pr.Issue.Repo.GetOwner(db.DefaultContext); err != nil { if err := pr.Issue.Repo.GetOwner(ctx); err != nil {
log.Error("GetOwner for issue repo [%d]: %v", pr.ID, err) log.Error("GetOwner for issue repo [%d]: %v", pr.ID, err)
} }
@ -487,7 +486,7 @@ func rawMerge(ctx context.Context, pr *models.PullRequest, doer *user_model.User
} }
var headUser *user_model.User var headUser *user_model.User
err = pr.HeadRepo.GetOwner(db.DefaultContext) err = pr.HeadRepo.GetOwner(ctx)
if err != nil { if err != nil {
if !user_model.IsErrUserNotExist(err) { if !user_model.IsErrUserNotExist(err) {
log.Error("Can't find user: %d for head repository - %v", pr.HeadRepo.OwnerID, err) log.Error("Can't find user: %d for head repository - %v", pr.HeadRepo.OwnerID, err)

2
services/pull/pull.go
Unescape View File

@ -69,7 +69,7 @@ func NewPullRequest(ctx context.Context, repo *repo_model.Repository, pull *mode
return err return err
} }
mentions, err := pull.FindAndUpdateIssueMentions(db.DefaultContext, pull.Poster, pull.Content) mentions, err := pull.FindAndUpdateIssueMentions(ctx, pull.Poster, pull.Content)
if err != nil { if err != nil {
return err return err
} }

2
services/pull/review.go
Unescape View File

@ -61,7 +61,7 @@ func CreateCodeComment(ctx context.Context, doer *user_model.User, gitRepo *git.
return nil, err return nil, err
} }
mentions, err := issue.FindAndUpdateIssueMentions(db.DefaultContext, doer, comment.Content) mentions, err := issue.FindAndUpdateIssueMentions(ctx, doer, comment.Content)
if err != nil { if err != nil {
return nil, err return nil, err
} }

5
services/pull/temp_repo.go
Unescape View File

@ -13,7 +13,6 @@ import (
"strings" "strings"
"code.gitea.io/gitea/models" "code.gitea.io/gitea/models"
"code.gitea.io/gitea/models/db"
repo_model "code.gitea.io/gitea/models/repo" repo_model "code.gitea.io/gitea/models/repo"
"code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
@ -38,10 +37,10 @@ func createTemporaryRepo(ctx context.Context, pr *models.PullRequest) (string, e
return "", &repo_model.ErrRepoNotExist{ return "", &repo_model.ErrRepoNotExist{
ID: pr.BaseRepoID, ID: pr.BaseRepoID,
} }
} else if err := pr.HeadRepo.GetOwner(db.DefaultContext); err != nil { } else if err := pr.HeadRepo.GetOwner(ctx); err != nil {
log.Error("HeadRepo.GetOwner: %v", err) log.Error("HeadRepo.GetOwner: %v", err)
return "", fmt.Errorf("HeadRepo.GetOwner: %v", err) return "", fmt.Errorf("HeadRepo.GetOwner: %v", err)
} else if err := pr.BaseRepo.GetOwner(db.DefaultContext); err != nil { } else if err := pr.BaseRepo.GetOwner(ctx); err != nil {
log.Error("BaseRepo.GetOwner: %v", err) log.Error("BaseRepo.GetOwner: %v", err)
return "", fmt.Errorf("BaseRepo.GetOwner: %v", err) return "", fmt.Errorf("BaseRepo.GetOwner: %v", err)
} }

4
services/release/release.go
Unescape View File

@ -130,7 +130,7 @@ func CreateRelease(gitRepo *git.Repository, rel *models.Release, attachmentUUIDs
return err return err
} }
if err = models.AddReleaseAttachments(db.DefaultContext, rel.ID, attachmentUUIDs); err != nil { if err = models.AddReleaseAttachments(gitRepo.Ctx, rel.ID, attachmentUUIDs); err != nil {
return err return err
} }
@ -319,7 +319,7 @@ func DeleteReleaseByID(ctx context.Context, id int64, doer *user_model.User, del
} else { } else {
rel.IsTag = true rel.IsTag = true
if err = models.UpdateRelease(db.DefaultContext, rel); err != nil { if err = models.UpdateRelease(ctx, rel); err != nil {
return fmt.Errorf("Update: %v", err) return fmt.Errorf("Update: %v", err)
} }
} }

8
services/repository/check.go
Unescape View File

@ -27,7 +27,7 @@ func GitFsck(ctx context.Context, timeout time.Duration, args []string) error {
log.Trace("Doing: GitFsck") log.Trace("Doing: GitFsck")
if err := db.Iterate( if err := db.Iterate(
db.DefaultContext, ctx,
new(repo_model.Repository), new(repo_model.Repository),
builder.Expr("id>0 AND is_fsck_enabled=?", true), builder.Expr("id>0 AND is_fsck_enabled=?", true),
func(idx int, bean interface{}) error { func(idx int, bean interface{}) error {
@ -62,7 +62,7 @@ func GitGcRepos(ctx context.Context, timeout time.Duration, args ...string) erro
args = append([]string{"gc"}, args...) args = append([]string{"gc"}, args...)
if err := db.Iterate( if err := db.Iterate(
db.DefaultContext, ctx,
new(repo_model.Repository), new(repo_model.Repository),
builder.Gt{"id": 0}, builder.Gt{"id": 0},
func(idx int, bean interface{}) error { func(idx int, bean interface{}) error {
@ -97,7 +97,7 @@ func GitGcRepos(ctx context.Context, timeout time.Duration, args ...string) erro
} }
// Now update the size of the repository // Now update the size of the repository
if err := models.UpdateRepoSize(db.DefaultContext, repo); err != nil { if err := models.UpdateRepoSize(ctx, repo); err != nil {
log.Error("Updating size as part of garbage collection failed for %v. Stdout: %s\nError: %v", repo, stdout, err) log.Error("Updating size as part of garbage collection failed for %v. Stdout: %s\nError: %v", repo, stdout, err)
desc := fmt.Sprintf("Updating size as part of garbage collection failed for %s. Stdout: %s\nError: %v", repo.RepoPath(), stdout, err) desc := fmt.Sprintf("Updating size as part of garbage collection failed for %s. Stdout: %s\nError: %v", repo.RepoPath(), stdout, err)
if err = admin_model.CreateRepositoryNotice(desc); err != nil { if err = admin_model.CreateRepositoryNotice(desc); err != nil {
@ -119,7 +119,7 @@ func GitGcRepos(ctx context.Context, timeout time.Duration, args ...string) erro
func gatherMissingRepoRecords(ctx context.Context) ([]*repo_model.Repository, error) { func gatherMissingRepoRecords(ctx context.Context) ([]*repo_model.Repository, error) {
repos := make([]*repo_model.Repository, 0, 10) repos := make([]*repo_model.Repository, 0, 10)
if err := db.Iterate( if err := db.Iterate(
db.DefaultContext, ctx,
new(repo_model.Repository), new(repo_model.Repository),
builder.Gt{"id": 0}, builder.Gt{"id": 0},
func(idx int, bean interface{}) error { func(idx int, bean interface{}) error {

2
services/repository/hooks.go
Unescape View File

@ -23,7 +23,7 @@ func SyncRepositoryHooks(ctx context.Context) error {
log.Trace("Doing: SyncRepositoryHooks") log.Trace("Doing: SyncRepositoryHooks")
if err := db.Iterate( if err := db.Iterate(
db.DefaultContext, ctx,
new(repo_model.Repository), new(repo_model.Repository),
builder.Gt{"id": 0}, builder.Gt{"id": 0},
func(idx int, bean interface{}) error { func(idx int, bean interface{}) error {

2
services/repository/push.go
Unescape View File

@ -95,7 +95,7 @@ func pushUpdates(optsList []*repo_module.PushUpdateOptions) error {
} }
defer gitRepo.Close() defer gitRepo.Close()
if err = models.UpdateRepoSize(db.DefaultContext, repo); err != nil { if err = models.UpdateRepoSize(ctx, repo); err != nil {
log.Error("Failed to update size for repository: %v", err) log.Error("Failed to update size for repository: %v", err)
} }

4
services/user/user.go
Unescape View File

@ -78,7 +78,7 @@ func DeleteUser(u *user_model.User) error {
path := user_model.UserPath(u.Name) path := user_model.UserPath(u.Name)
if err := util.RemoveAll(path); err != nil { if err := util.RemoveAll(path); err != nil {
err = fmt.Errorf("Failed to RemoveAll %s: %v", path, err) err = fmt.Errorf("Failed to RemoveAll %s: %v", path, err)
_ = admin_model.CreateNotice(db.DefaultContext, admin_model.NoticeTask, fmt.Sprintf("delete user '%s': %v", u.Name, err)) _ = admin_model.CreateNotice(ctx, admin_model.NoticeTask, fmt.Sprintf("delete user '%s': %v", u.Name, err))
return err return err
} }
@ -86,7 +86,7 @@ func DeleteUser(u *user_model.User) error {
avatarPath := u.CustomAvatarRelativePath() avatarPath := u.CustomAvatarRelativePath()
if err := storage.Avatars.Delete(avatarPath); err != nil { if err := storage.Avatars.Delete(avatarPath); err != nil {
err = fmt.Errorf("Failed to remove %s: %v", avatarPath, err) err = fmt.Errorf("Failed to remove %s: %v", avatarPath, err)
_ = admin_model.CreateNotice(db.DefaultContext, admin_model.NoticeTask, fmt.Sprintf("delete user '%s': %v", u.Name, err)) _ = admin_model.CreateNotice(ctx, admin_model.NoticeTask, fmt.Sprintf("delete user '%s': %v", u.Name, err))
return err return err
} }
} }

Write Preview
Loading…
Cancel
Save