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 /routers/api/v1/org | |
| 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 'routers/api/v1/org')
| -rw-r--r-- | routers/api/v1/org/hook.go | 2 | ||||
| -rw-r--r-- | routers/api/v1/org/label.go | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/routers/api/v1/org/hook.go b/routers/api/v1/org/hook.go index 67957430d1..ddf0ddefe6 100644 --- a/routers/api/v1/org/hook.go +++ b/routers/api/v1/org/hook.go @@ -51,7 +51,7 @@ func ListHooks(ctx *context.APIContext) { return } - orgHooks, err := webhook.ListWebhooksByOpts(opts) + orgHooks, err := webhook.ListWebhooksByOpts(ctx, opts) if err != nil { ctx.InternalServerError(err) return diff --git a/routers/api/v1/org/label.go b/routers/api/v1/org/label.go index d36b1d9a98..9844ea21d2 100644 --- a/routers/api/v1/org/label.go +++ b/routers/api/v1/org/label.go @@ -43,7 +43,7 @@ func ListLabels(ctx *context.APIContext) { // "200": // "$ref": "#/responses/LabelList" - labels, err := models.GetLabelsByOrgID(ctx.Org.Organization.ID, ctx.FormString("sort"), utils.GetListOptions(ctx)) + labels, err := models.GetLabelsByOrgID(ctx, ctx.Org.Organization.ID, ctx.FormString("sort"), utils.GetListOptions(ctx)) if err != nil { ctx.Error(http.StatusInternalServerError, "GetLabelsByOrgID", err) return @@ -136,9 +136,9 @@ func GetLabel(ctx *context.APIContext) { ) strID := ctx.Params(":id") if intID, err2 := strconv.ParseInt(strID, 10, 64); err2 != nil { - label, err = models.GetLabelInOrgByName(ctx.Org.Organization.ID, strID) + label, err = models.GetLabelInOrgByName(ctx, ctx.Org.Organization.ID, strID) } else { - label, err = models.GetLabelInOrgByID(ctx.Org.Organization.ID, intID) + label, err = models.GetLabelInOrgByID(ctx, ctx.Org.Organization.ID, intID) } if err != nil { if models.IsErrOrgLabelNotExist(err) { @@ -183,7 +183,7 @@ func EditLabel(ctx *context.APIContext) { // "422": // "$ref": "#/responses/validationError" form := web.GetForm(ctx).(*api.EditLabelOption) - label, err := models.GetLabelInOrgByID(ctx.Org.Organization.ID, ctx.ParamsInt64(":id")) + label, err := models.GetLabelInOrgByID(ctx, ctx.Org.Organization.ID, ctx.ParamsInt64(":id")) if err != nil { if models.IsErrOrgLabelNotExist(err) { ctx.NotFound() |