From 60d95a0b858aa0c22bb621cbe079fb70261d594c Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Wed, 23 May 2018 15:23:23 +0800
Subject: [PATCH] fix bugs caused by #3929 (#3999)
---
routers/repo/webhook.go | 2 +-
templates/org/settings/hook_new.tmpl | 12 ++++++------
templates/org/settings/hooks.tmpl | 2 +-
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/routers/repo/webhook.go b/routers/repo/webhook.go
index 6994aa3344..63450ed887 100644
--- a/routers/repo/webhook.go
+++ b/routers/repo/webhook.go
@@ -25,7 +25,7 @@ import (
const (
tplHooks base.TplName = "repo/settings/webhook/base"
tplHookNew base.TplName = "repo/settings/webhook/new"
- tplOrgHookNew base.TplName = "org/settings/webhook/new"
+ tplOrgHookNew base.TplName = "org/settings/hook_new"
)
// Webhooks render web hooks list page
diff --git a/templates/org/settings/hook_new.tmpl b/templates/org/settings/hook_new.tmpl
index bedb2dc142..809009b66b 100644
--- a/templates/org/settings/hook_new.tmpl
+++ b/templates/org/settings/hook_new.tmpl
@@ -23,14 +23,14 @@
</div>
</h4>
<div class="ui attached segment">
- {{template "repo/settings/hook_gitea" .}}
- {{template "repo/settings/hook_gogs" .}}
- {{template "repo/settings/hook_slack" .}}
- {{template "repo/settings/hook_discord" .}}
- {{template "repo/settings/hook_dingtalk" .}}
+ {{template "repo/settings/webhook/gitea" .}}
+ {{template "repo/settings/webhook/gogs" .}}
+ {{template "repo/settings/webhook/slack" .}}
+ {{template "repo/settings/webhook/discord" .}}
+ {{template "repo/settings/webhook/dingtalk" .}}
</div>
- {{template "repo/settings/hook_history" .}}
+ {{template "repo/settings/webhook/history" .}}
</div>
</div>
</div>
diff --git a/templates/org/settings/hooks.tmpl b/templates/org/settings/hooks.tmpl
index 9052bf6146..825b1e941d 100644
--- a/templates/org/settings/hooks.tmpl
+++ b/templates/org/settings/hooks.tmpl
@@ -5,7 +5,7 @@
<div class="ui grid">
{{template "org/settings/navbar" .}}
<div class="twelve wide column content">
- {{template "repo/settings/hook_list" .}}
+ {{template "repo/settings/webhook/list" .}}
</div>
</div>
</div>