forked from gitea/gitea
Backport #24823 by @sonjek Should resolve first point of the issue https://github.com/go-gitea/gitea/issues/24574 Co-authored-by: Yevhen Pavlov <yevhen.pavlov.ua@gmail.com>
This commit is contained in:
parent
04f9ab1aa9
commit
f29c52a169
|
@ -4,6 +4,7 @@
|
|||
package admin
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"net/http"
|
||||
|
||||
"code.gitea.io/gitea/models/webhook"
|
||||
|
@ -74,7 +75,11 @@ func GetHook(ctx *context.APIContext) {
|
|||
hookID := ctx.ParamsInt64(":id")
|
||||
hook, err := webhook.GetSystemOrDefaultWebhook(ctx, hookID)
|
||||
if err != nil {
|
||||
ctx.Error(http.StatusInternalServerError, "GetSystemOrDefaultWebhook", err)
|
||||
if errors.Is(err, util.ErrNotExist) {
|
||||
ctx.NotFound()
|
||||
} else {
|
||||
ctx.Error(http.StatusInternalServerError, "GetSystemOrDefaultWebhook", err)
|
||||
}
|
||||
return
|
||||
}
|
||||
h, err := webhook_service.ToHook("/admin/", hook)
|
||||
|
@ -163,7 +168,7 @@ func DeleteHook(ctx *context.APIContext) {
|
|||
|
||||
hookID := ctx.ParamsInt64(":id")
|
||||
if err := webhook.DeleteDefaultSystemWebhook(ctx, hookID); err != nil {
|
||||
if webhook.IsErrWebhookNotExist(err) {
|
||||
if errors.Is(err, util.ErrNotExist) {
|
||||
ctx.NotFound()
|
||||
} else {
|
||||
ctx.Error(http.StatusInternalServerError, "DeleteDefaultSystemWebhook", err)
|
||||
|
|
Loading…
Reference in New Issue