aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUnknwon <u@gogs.io>2017-03-13 06:00:37 -0400
committerUnknwon <u@gogs.io>2017-03-13 06:00:37 -0400
commite1dcd1105168e9a66f5bfcdb3e169580ad21a2e3 (patch)
tree8a5d213bd0afe8df8f88e8d44b6825400a448bc6
parent24734a33e72dbdc1da4f7341cb2cf62521ce53f8 (diff)
repo/settings: improve Git hook editor
-rw-r--r--routers/repo/setting.go3
-rw-r--r--templates/repo/settings/githook_edit.tmpl12
2 files changed, 12 insertions, 3 deletions
diff --git a/routers/repo/setting.go b/routers/repo/setting.go
index 015c42c1..6ccd058a 100644
--- a/routers/repo/setting.go
+++ b/routers/repo/setting.go
@@ -499,6 +499,7 @@ func SettingsGitHooks(ctx *context.Context) {
func SettingsGitHooksEdit(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("repo.settings.githooks")
ctx.Data["PageIsSettingsGitHooks"] = true
+ ctx.Data["RequireSimpleMDE"] = true
name := ctx.Params(":name")
hook, err := ctx.Repo.GitRepo.GetHook(name)
@@ -530,7 +531,7 @@ func SettingsGitHooksEditPost(ctx *context.Context) {
ctx.Handle(500, "hook.Update", err)
return
}
- ctx.Redirect(ctx.Repo.RepoLink + "/settings/hooks/git")
+ ctx.Redirect(ctx.Data["Link"].(string))
}
func SettingsDeployKeys(ctx *context.Context) {
diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl
index d139fd3f..807c590d 100644
--- a/templates/repo/settings/githook_edit.tmpl
+++ b/templates/repo/settings/githook_edit.tmpl
@@ -16,11 +16,11 @@
{{with .Hook}}
<div class="inline field">
<label>{{$.i18n.Tr "repo.settings.githook_name"}}</label>
- <span>{{.Name}}</span>
+ <span><code>{{.Name}}</code></span>
</div>
<div class="field">
<label for="content">{{$.i18n.Tr "repo.settings.githook_content"}}</label>
- <textarea id="content" name="content" rows="20" wrap="off" autofocus>{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea>
+ <textarea id="content" name="content" wrap="off" autofocus>{{if .IsActive}}{{.Content}}{{else}}{{.Sample}}{{end}}</textarea>
</div>
<div class="inline field">
@@ -33,4 +33,12 @@
</div>
</div>
</div>
+
+<script>
+ CodeMirror.autoLoadMode(CodeMirror.fromTextArea($('#content')[0], {
+ lineNumbers: true,
+ mode: 'shell'
+ }), "shell");
+</script>
+
{{template "base/footer" .}}