From 3d93532c87823159dd03e9c64a58c7bafed0fa64 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 16 Jul 2016 01:02:55 +0800 Subject: #3274 fix can't get webhook detail of organization --- routers/repo/webhook.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'routers/repo/webhook.go') diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go index d9048623..b2274033 100644 --- a/routers/repo/webhook.go +++ b/routers/repo/webhook.go @@ -220,7 +220,12 @@ func checkWebhook(ctx *context.Context) (*OrgRepoCtx, *models.Webhook) { } ctx.Data["BaseLink"] = orCtx.Link - w, err := models.GetWebhookByID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) + var w *models.Webhook + if orCtx.RepoID > 0 { + w, err = models.GetWebhookByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id")) + } else { + w, err = models.GetWebhookByOrgID(ctx.Org.Organization.Id, ctx.ParamsInt64(":id")) + } if err != nil { if models.IsErrWebhookNotExist(err) { ctx.Handle(404, "GetWebhookByID", nil) -- cgit v1.2.3