From 142d54ac559822e872bbb1c12ead4e7de393624d Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 6 Jun 2026 21:11:46 +0800 Subject: [PATCH] fix --- routers/api/v1/admin/user.go | 4 ++-- routers/api/v1/shared/action.go | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/routers/api/v1/admin/user.go b/routers/api/v1/admin/user.go index bccde18df66..b027a6450df 100644 --- a/routers/api/v1/admin/user.go +++ b/routers/api/v1/admin/user.go @@ -287,7 +287,7 @@ func DeleteUser(ctx *context.APIContext) { // "$ref": "#/responses/validationError" if ctx.ContextUser.IsOrganization() { - ctx.APIError(http.StatusUnprocessableEntity, "not an organization") + ctx.APIError(http.StatusUnprocessableEntity, "target is an organization but not an user") return } @@ -547,7 +547,7 @@ func RenameUser(ctx *context.APIContext) { // "$ref": "#/responses/validationError" if ctx.ContextUser.IsOrganization() { - ctx.APIError(http.StatusUnprocessableEntity, "not an organization") + ctx.APIError(http.StatusUnprocessableEntity, "target is an organization but not an user") return } diff --git a/routers/api/v1/shared/action.go b/routers/api/v1/shared/action.go index a69a8cd2667..5c95fa192c0 100644 --- a/routers/api/v1/shared/action.go +++ b/routers/api/v1/shared/action.go @@ -16,6 +16,7 @@ import ( "gitea.dev/modules/optional" "gitea.dev/modules/setting" api "gitea.dev/modules/structs" + "gitea.dev/modules/util" "gitea.dev/modules/webhook" "gitea.dev/routers/api/v1/utils" "gitea.dev/services/context" @@ -53,7 +54,7 @@ func ListJobs(ctx *context.APIContext, ownerID, repoID, runID int64, runAttemptI for _, status := range ctx.FormStrings("status") { values, err := convertToInternal(status) if err != nil { - ctx.APIError(http.StatusBadRequest, "invalid status") + ctx.APIError(http.StatusBadRequest, err.Error()) return } opts.Statuses = append(opts.Statuses, values...) @@ -125,7 +126,7 @@ func convertToInternal(s string) ([]actions_model.Status, error) { case "cancelled", "timed_out": return []actions_model.Status{actions_model.StatusCancelled}, nil default: - return nil, fmt.Errorf("invalid status %s", s) + return nil, util.NewInvalidArgumentErrorf("invalid status %s", s) } } @@ -155,7 +156,7 @@ func ListRuns(ctx *context.APIContext, ownerID, repoID int64) { for _, status := range ctx.FormStrings("status") { values, err := convertToInternal(status) if err != nil { - ctx.APIError(http.StatusBadRequest, "invalid status") + ctx.APIError(http.StatusBadRequest, err.Error()) return } opts.Status = append(opts.Status, values...)