Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2026-08-03 17:37:53 +02:00
Code Issues Activity

fix

Browse Source
This commit is contained in:
wxiaoguang
2026-06-06 21:11:46 +08:00
parent f431889cd9
commit 142d54ac55
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routers/api/v1/admin/user.go
+2 -2
View File
@@ -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
}
routers/api/v1/shared/action.go
+4 -3
View File
@@ -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...)