From 9a1d5d2489d25778e26ab413cb9ee78d3fe2823a Mon Sep 17 00:00:00 2001 From: Unknwon Date: Sat, 9 Aug 2014 15:40:10 -0700 Subject: [PATCH] Finish new web hook pages --- cmd/serve.go | 20 ++++++-- cmd/web.go | 4 +- conf/locale/locale_en-US.ini | 14 ++++++ conf/locale/locale_zh-CN.ini | 14 ++++++ models/publickey.go | 18 +++++++ models/webhook.go | 37 +++++++++++--- modules/auth/repo_form.go | 2 +- modules/git/repo_commit.go | 2 +- modules/httplib/README.md | 62 ----------------------- public/ng/css/gogs.css | 14 ++++++ public/ng/css/ui.css | 6 +++ public/ng/less/gogs/base.less | 3 ++ public/ng/less/gogs/settings.less | 1 + public/ng/less/ui/form.less | 41 ++++++++------- public/ng/less/ui/panel.less | 1 + routers/repo/setting.go | 57 +++++++++++---------- templates/repo/create.tmpl | 4 +- templates/repo/hook_add.tmpl | 62 ----------------------- templates/repo/hook_edit.tmpl | 72 --------------------------- templates/repo/settings/hook_new.tmpl | 68 +++++++++++++++++++++++++ templates/repo/settings/hooks.tmpl | 6 ++- templates/repo/settings/options.tmpl | 4 +- templates/user/settings/sshkeys.tmpl | 2 +- 23 files changed, 249 insertions(+), 265 deletions(-) delete mode 100755 modules/httplib/README.md delete mode 100644 templates/repo/hook_add.tmpl delete mode 100644 templates/repo/hook_edit.tmpl create mode 100644 templates/repo/settings/hook_new.tmpl diff --git a/cmd/serve.go b/cmd/serve.go index 41dece6fa1af..b1dffc92e7bd 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -11,10 +11,10 @@ import ( "path" "path/filepath" "strings" - - "github.com/codegangsta/cli" + "time" "github.com/Unknwon/com" + "github.com/codegangsta/cli" "github.com/gogits/gogs/models" "github.com/gogits/gogs/modules/log" @@ -184,19 +184,29 @@ func runServ(k *cli.Context) { if isWrite { tasks, err := models.GetUpdateTasksByUuid(uuid) if err != nil { - log.GitLogger.Fatal(2, "Fail to get update task: %v", err) + log.GitLogger.Fatal(2, "GetUpdateTasksByUuid: %v", err) } for _, task := range tasks { err = models.Update(task.RefName, task.OldCommitId, task.NewCommitId, user.Name, repoUserName, repoName, user.Id) if err != nil { - log.GitLogger.Fatal(2, "Fail to update: %v", err) + log.GitLogger.Error(2, "Fail to update: %v", err) } } if err = models.DelUpdateTasksByUuid(uuid); err != nil { - log.GitLogger.Fatal(2, "Fail to del update task: %v", err) + log.GitLogger.Fatal(2, "DelUpdateTasksByUuid: %v", err) } } + + // Update key activity. + key, err := models.GetPublicKeyById(keyId) + if err != nil { + log.GitLogger.Fatal(2, "GetPublicKeyById: %v", err) + } + key.Updated = time.Now() + if err = models.UpdatePublicKey(key); err != nil { + log.GitLogger.Fatal(2, "UpdatePublicKey: %v", err) + } } diff --git a/cmd/web.go b/cmd/web.go index 474e86b3e3b5..dcfe95003edf 100644 --- a/cmd/web.go +++ b/cmd/web.go @@ -256,8 +256,8 @@ func runWeb(*cli.Context) { m.Group("/settings", func(r *macaron.Router) { r.Route("/collaboration", "GET,POST", repo.SettingsCollaboration) r.Get("/hooks", repo.Webhooks) - r.Get("/hooks/new", repo.WebHooksAdd) - r.Post("/hooks/add", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksAddPost) + r.Get("/hooks/new", repo.WebHooksNew) + r.Post("/hooks/new", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksNewPost) r.Get("/hooks/:id", repo.WebHooksEdit) r.Post("/hooks/:id", bindIgnErr(auth.NewWebhookForm{}), repo.WebHooksEditPost) }) diff --git a/conf/locale/locale_en-US.ini b/conf/locale/locale_en-US.ini index 5e6974d2eb5f..42fffa08da29 100644 --- a/conf/locale/locale_en-US.ini +++ b/conf/locale/locale_en-US.ini @@ -62,6 +62,7 @@ Password = Password Retype = Re-type password SSHTitle = SSH key name HttpsUrl = HTTPS URL +PayloadUrl = Payload URL require_error = ` cannot be empty.` alpha_dash_error = ` must be valid alpha or numeric or dash(-_) characters.` @@ -181,6 +182,19 @@ settings.remove_collaborator_success = Collaborator has been removed. settings.add_webhook = Add Webhook settings.hooks_desc = Webhooks allow external services to be notified when certain events happen on Gogs. When the specified events happen, we'll send a POST request to each of the URLs you provide. Learn more in our Webhooks Guide. settings.remove_hook_success = Webhook has been removed. +settings.add_webhook_desc = We’ll send a POST request to the URL below with details of any subscribed events. You can also specify which data format you'd like to receive (JSON, x-www-form-urlencoded, etc). More information can be found in Webhooks Guide. +settings.payload_url = Payload URL +settings.content_type = Content Type +settings.secret = Secret +settings.event_desc = Which events would you like to trigger this webhook? +settings.event_push_only = Just the push event. +settings.active = Active +settings.active_helper = We will deliver event details when this hook is triggered. +settings.add_hook_success = New webhook has been added. +settings.update_webhook = Update Webhook +settings.update_hook_success = Webhook has been updated. +settings.delete_webhook = Delete Webhook +settings.recent_deliveries = Recent Deliveries [org] org_name_holder = Organization Name diff --git a/conf/locale/locale_zh-CN.ini b/conf/locale/locale_zh-CN.ini index 2bacaa5a7eff..fb49ade8c49f 100644 --- a/conf/locale/locale_zh-CN.ini +++ b/conf/locale/locale_zh-CN.ini @@ -62,6 +62,7 @@ Password = 密码 Retype = 确认密码 SSHTitle = SSH 密钥名称 HttpsUrl = HTTPS URL 地址 +PayloadUrl = 推送地址 require_error = 不能为空。 alpha_dash_error = 必须为英文字母、阿拉伯数字或横线（-_）。 @@ -181,6 +182,19 @@ settings.remove_collaborator_success = 被操作的协作者已经被收回权 settings.add_webhook = 添加 Web 钩子 settings.hooks_desc = Web 钩子允许您设定在 Gogs 上发生指定事件时对指定 URL 发送 POST 通知。查看 Webhooks 文档 获取更多信息。 settings.remove_hook_success = Web 钩子删除成功！ +settings.add_webhook_desc = 我们会通过 POST 请求将订阅事件信息发送至向指定 URL 地址。您可以设置不同的数据接收方式（JSON 或 x-www-form-urlencoded）。 请查阅 Webhooks 文档 获取更多信息。 +settings.payload_url = 推送地址 +settings.content_type = 数据格式 +settings.secret = 密钥文本 +settings.event_desc = 请设置您希望触发 Web 钩子的事件： +settings.event_push_only = 只推送 push 事件。 +settings.active = 是否激活 +settings.active_helper = 当指定事件发生时我们将会触发此 Web 钩子。 +settings.add_hook_success = Web 钩子添加成功！ +settings.update_webhook = 更新 Web 钩子 +settings.update_hook_success = Web 钩子更新成功！ +settings.delete_webhook = 删除 Web 钩子 +settings.recent_deliveries = 最近推送记录 [org] org_name_holder = 组织名称 diff --git a/models/publickey.go b/models/publickey.go index f9880c74cde3..1246cffc587a 100644 --- a/models/publickey.go +++ b/models/publickey.go @@ -209,6 +209,18 @@ func AddPublicKey(key *PublicKey) (err error) { return nil } +// GetPublicKeyById returns public key by given ID. +func GetPublicKeyById(keyId int64) (*PublicKey, error) { + key := new(PublicKey) + has, err := x.Id(keyId).Get(key) + if err != nil { + return nil, err + } else if !has { + return nil, ErrKeyNotExist + } + return key, nil +} + // ListPublicKey returns a list of all public keys that user has. func ListPublicKey(uid int64) ([]*PublicKey, error) { keys := make([]*PublicKey, 0, 5) @@ -277,6 +289,12 @@ func rewriteAuthorizedKeys(key *PublicKey, p, tmpP string) error { return nil } +// UpdatePublicKey updates given public key. +func UpdatePublicKey(key *PublicKey) error { + _, err := x.Id(key.Id).AllCols().Update(key) + return err +} + // DeletePublicKey deletes SSH key information both in database and authorized_keys file. func DeletePublicKey(key *PublicKey) error { has, err := x.Get(key) diff --git a/models/webhook.go b/models/webhook.go index 925ec1a7de29..17a41e66c65e 100644 --- a/models/webhook.go +++ b/models/webhook.go @@ -12,6 +12,7 @@ import ( "github.com/gogits/gogs/modules/httplib" "github.com/gogits/gogs/modules/log" "github.com/gogits/gogs/modules/setting" + "github.com/gogits/gogs/modules/uuid" ) var ( @@ -122,6 +123,12 @@ const ( SERVICE ) +type HookEventType string + +const ( + PUSH HookEventType = "push" +) + type PayloadAuthor struct { Name string `json:"name"` Email string `json:"email"` @@ -157,13 +164,16 @@ type Payload struct { // HookTask represents a hook task. type HookTask struct { Id int64 + Uuid string Type HookTaskType Url string *Payload `xorm:"-"` PayloadContent string `xorm:"TEXT"` ContentType HookContentType + EventType HookEventType IsSsl bool IsDeliveried bool + IsSucceed bool } // CreateHookTask creates a new hook task, @@ -173,6 +183,7 @@ func CreateHookTask(t *HookTask) error { if err != nil { return err } + t.Uuid = uuid.NewV4().String() t.PayloadContent = string(data) _, err = x.Insert(t) return err @@ -190,20 +201,32 @@ func DeliverHooks() { x.Where("is_deliveried=?", false).Iterate(new(HookTask), func(idx int, bean interface{}) error { t := bean.(*HookTask) - // Only support JSON now. - if _, err := httplib.Post(t.Url).SetTimeout(timeout, timeout). - Body([]byte(t.PayloadContent)).Response(); err != nil { - log.Error(4, "webhook.DeliverHooks(Delivery): %v", err) - return nil + req := httplib.Post(t.Url).SetTimeout(timeout, timeout). + Header("X-Gogs-Delivery", t.Uuid). + Header("X-Gogs-Event", string(t.EventType)) + + switch t.ContentType { + case JSON: + req = req.Header("Content-Type", "application/json").Body(t.PayloadContent) + case FORM: + req.Param("payload", t.PayloadContent) } t.IsDeliveried = true + + // TODO: record response. + if _, err := req.Response(); err != nil { + log.Error(4, "Delivery: %v", err) + } else { + t.IsSucceed = true + } + if err := UpdateHookTask(t); err != nil { - log.Error(4, "webhook.DeliverHooks(UpdateHookTask): %v", err) + log.Error(4, "UpdateHookTask: %v", err) return nil } - log.Trace("Hook delivered: %s", t.PayloadContent) + log.Trace("Hook delivered(%s): %s", t.Uuid, t.PayloadContent) return nil }) } diff --git a/modules/auth/repo_form.go b/modules/auth/repo_form.go index 1b1a4f71203d..3eb0cbc56498 100644 --- a/modules/auth/repo_form.go +++ b/modules/auth/repo_form.go @@ -69,7 +69,7 @@ func (f *RepoSettingForm) Validate(ctx *macaron.Context, errs *binding.Errors, l // \/ \/ \/ \/ \/ \/ type NewWebhookForm struct { - Url string `form:"url" binding:"Required;Url"` + PayloadUrl string `form:"payload_url" binding:"Required;Url"` ContentType string `form:"content_type" binding:"Required"` Secret string `form:"secret"` PushOnly bool `form:"push_only"` diff --git a/modules/git/repo_commit.go b/modules/git/repo_commit.go index 0e39963e687d..eebe3dd0e086 100644 --- a/modules/git/repo_commit.go +++ b/modules/git/repo_commit.go @@ -112,7 +112,7 @@ func (repo *Repository) getCommit(id sha1) (*Commit, error) { data, bytErr, err := com.ExecCmdDirBytes(repo.Path, "git", "cat-file", "-p", id.String()) if err != nil { - return nil, errors.New(string(bytErr)) + return nil, errors.New(err.Error() + ": " + string(bytErr)) } commit, err := parseCommitData(data) diff --git a/modules/httplib/README.md b/modules/httplib/README.md deleted file mode 100755 index 95a10d867704..000000000000 --- a/modules/httplib/README.md +++ /dev/null @@ -1,62 +0,0 @@ -# httplib -httplib is an libs help you to curl remote url. - -# How to use? - -## GET -you can use Get to crawl data. - - import "httplib" - - str, err := httplib.Get("http://beego.me/").String() - if err != nil { - t.Fatal(err) - } - fmt.Println(str) - -## POST -POST data to remote url - - b:=httplib.Post("http://beego.me/") - b.Param("username","astaxie") - b.Param("password","123456") - str, err := b.String() - if err != nil { - t.Fatal(err) - } - fmt.Println(str) - -## set timeout -you can set timeout in request.default is 60 seconds. - -set Get timeout: - - httplib.Get("http://beego.me/").SetTimeout(100 * time.Second, 30 * time.Second) - -set post timeout: - - httplib.Post("http://beego.me/").SetTimeout(100 * time.Second, 30 * time.Second) - -- first param is connectTimeout. -- second param is readWriteTimeout - -## debug -if you want to debug the request info, set the debug on - - httplib.Get("http://beego.me/").Debug(true) - -## support HTTPS client -if request url is https. You can set the client support TSL: - - httplib.SetTLSClientConfig(&tls.Config{InsecureSkipVerify: true}) - -more info about the tls.Config please visit http://golang.org/pkg/crypto/tls/#Config - -## set cookie -some http request need setcookie. So set it like this: - - cookie := &http.Cookie{} - cookie.Name = "username" - cookie.Value = "astaxie" - httplib.Get("http://beego.me/").SetCookie(cookie) - diff --git a/public/ng/css/gogs.css b/public/ng/css/gogs.css index e3eb4c88079e..0c3a40db381d 100644 --- a/public/ng/css/gogs.css +++ b/public/ng/css/gogs.css @@ -223,6 +223,9 @@ img.avatar-48 { .text-red { color: #DD4B39; } +.text-grey { + color: #999999; +} .markdown { background-color: white; font-size: 16px; @@ -1361,27 +1364,33 @@ The register and sign-in page style margin-bottom: 24px; } #repo-hooks-panel, +#repo-hooks-history-panel, #user-ssh-panel { margin-bottom: 20px; } #repo-hooks-panel .setting-list, +#repo-hooks-history-panel .setting-list, #user-ssh-panel .setting-list { background-color: #FFF; } #repo-hooks-panel .setting-list li, +#repo-hooks-history-panel .setting-list li, #user-ssh-panel .setting-list li { padding: 8px 20px; border-bottom: 1px solid #eaeaea; } #repo-hooks-panel .setting-list li.ssh:hover, +#repo-hooks-history-panel .setting-list li.ssh:hover, #user-ssh-panel .setting-list li.ssh:hover { background-color: #ffffEE; } #repo-hooks-panel .setting-list li i, +#repo-hooks-history-panel .setting-list li i, #user-ssh-panel .setting-list li i { padding-right: 5px; } #repo-hooks-panel .active-icon, +#repo-hooks-history-panel .active-icon, #user-ssh-panel .active-icon { width: 10px; height: 10px; @@ -1391,20 +1400,25 @@ The register and sign-in page style margin-top: 10px; } #repo-hooks-panel .ssh-content, +#repo-hooks-history-panel .ssh-content, #user-ssh-panel .ssh-content { margin-left: 24px; } #repo-hooks-panel .ssh-content .octicon, +#repo-hooks-history-panel .ssh-content .octicon, #user-ssh-panel .ssh-content .octicon { margin-right: 4px; } #repo-hooks-panel .ssh-content .print, +#repo-hooks-history-panel .ssh-content .print, #user-ssh-panel .ssh-content .print, #repo-hooks-panel .ssh-content .activity, +#repo-hooks-history-panel .ssh-content .activity, #user-ssh-panel .ssh-content .activity { color: #888; } #repo-hooks-panel .ssh-delete-btn, +#repo-hooks-history-panel .ssh-delete-btn, #user-ssh-panel .ssh-delete-btn { margin-top: 6px; } diff --git a/public/ng/css/ui.css b/public/ng/css/ui.css index df03818b71f3..e5b0de330470 100644 --- a/public/ng/css/ui.css +++ b/public/ng/css/ui.css @@ -392,6 +392,7 @@ dt { color: #FFF; } .btn-red { + color: #FFF; background-color: #d9453d; border: 1px solid #d9453d; } @@ -432,6 +433,10 @@ dt { color: white; padding: 0 10px; } +.btn-link { + overflow: visible; + padding: .6em 1.2em; +} .btn-radius { border-radius: .25em; } @@ -673,6 +678,7 @@ ul.menu-radius > li:last-child > a { background-color: white; } .panel .panel-body .panel-desc { + padding: 0 40px; margin-bottom: 20px; } .panel .panel-content { diff --git a/public/ng/less/gogs/base.less b/public/ng/less/gogs/base.less index 8d22557a6616..96842f478d3a 100644 --- a/public/ng/less/gogs/base.less +++ b/public/ng/less/gogs/base.less @@ -239,4 +239,7 @@ clear: both; } .text-red { color: #DD4B39; +} +.text-grey { + color: #999999; } \ No newline at end of file diff --git a/public/ng/less/gogs/settings.less b/public/ng/less/gogs/settings.less index c908af3b63a6..af38ca28f531 100644 --- a/public/ng/less/gogs/settings.less +++ b/public/ng/less/gogs/settings.less @@ -52,6 +52,7 @@ } #repo-hooks-panel, +#repo-hooks-history-panel, #user-ssh-panel { margin-bottom: 20px; .setting-list { diff --git a/public/ng/less/ui/form.less b/public/ng/less/ui/form.less index 268baea88200..fa36b5dc1396 100644 --- a/public/ng/less/ui/form.less +++ b/public/ng/less/ui/form.less @@ -32,16 +32,15 @@ color: #FFF; } } - .btn-red { - background-color: @btnRedColor; - border: 1px solid @btnRedColor; - &:hover { - background-color: @btnHoverRedColor; color: #FFF; - } + background-color: @btnRedColor; + border: 1px solid @btnRedColor; + &:hover { + background-color: @btnHoverRedColor; + color: #FFF; + } } - .btn-orange { background-color: @btnOrangeColor; border: 1px solid @btnOrangeColor; @@ -73,33 +72,33 @@ // status buttons .btn-active { - box-shadow: 0 0 0 1px rgba(0, 0, 0, .1) inset, 0 0 4px rgba(0, 0, 0, .15) inset + box-shadow: 0 0 0 1px rgba(0, 0, 0, .1) inset, 0 0 4px rgba(0, 0, 0, .15) inset } .btn-header { margin-top: -1px; color: white; padding: 0 10px; } - +.btn-link { + overflow: visible; + padding: .6em 1.2em; +} .btn-radius { - border-radius: .25em; + border-radius: .25em; } - .btn-left-radius { - border-top-left-radius: .25em; - border-bottom-left-radius: .25em; + border-top-left-radius: .25em; + border-bottom-left-radius: .25em; } - .btn-right-radius { - border-top-right-radius: .25em; - border-bottom-right-radius: .25em; + border-top-right-radius: .25em; + border-bottom-right-radius: .25em; } - .btn-block { - display: block; - width: 100%; - box-sizing: content-box; - text-align: center; + display: block; + width: 100%; + box-sizing: content-box; + text-align: center; } .btn-disabled { diff --git a/public/ng/less/ui/panel.less b/public/ng/less/ui/panel.less index f05f0c16acb1..dc77715d5336 100644 --- a/public/ng/less/ui/panel.less +++ b/public/ng/less/ui/panel.less @@ -10,6 +10,7 @@ .panel-body { background-color: white; .panel-desc { + padding: 0 40px; margin-bottom: 20px; } } diff --git a/routers/repo/setting.go b/routers/repo/setting.go index 5867d161e4c3..10a6f72db7f9 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -24,9 +24,7 @@ const ( SETTINGS_OPTIONS base.TplName = "repo/settings/options" COLLABORATION base.TplName = "repo/settings/collaboration" HOOKS base.TplName = "repo/settings/hooks" - - HOOK_ADD base.TplName = "repo/hook_add" - HOOK_EDIT base.TplName = "repo/hook_edit" + HOOK_NEW base.TplName = "repo/settings/hook_new" ) func Settings(ctx *middleware.Context) { @@ -241,18 +239,22 @@ func Webhooks(ctx *middleware.Context) { ctx.HTML(200, HOOKS) } -func WebHooksAdd(ctx *middleware.Context) { - ctx.Data["IsRepoToolbarWebHooks"] = true - ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Add Webhook" - ctx.HTML(200, HOOK_ADD) +func WebHooksNew(ctx *middleware.Context) { + ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["PageIsSettingsHooks"] = true + ctx.Data["PageIsSettingsHooksNew"] = true + ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}} + ctx.HTML(200, HOOK_NEW) } -func WebHooksAddPost(ctx *middleware.Context, form auth.NewWebhookForm) { - ctx.Data["IsRepoToolbarWebHooks"] = true - ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Add Webhook" +func WebHooksNewPost(ctx *middleware.Context, form auth.NewWebhookForm) { + ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["PageIsSettingsHooks"] = true + ctx.Data["PageIsSettingsHooksNew"] = true + ctx.Data["Webhook"] = models.Webhook{HookEvent: &models.HookEvent{}} if ctx.HasError() { - ctx.HTML(200, HOOK_ADD) + ctx.HTML(200, HOOK_NEW) return } @@ -263,7 +265,7 @@ func WebHooksAddPost(ctx *middleware.Context, form auth.NewWebhookForm) { w := &models.Webhook{ RepoId: ctx.Repo.Repository.Id, - Url: form.Url, + Url: form.PayloadUrl, ContentType: ct, Secret: form.Secret, HookEvent: &models.HookEvent{ @@ -272,20 +274,21 @@ func WebHooksAddPost(ctx *middleware.Context, form auth.NewWebhookForm) { IsActive: form.Active, } if err := w.UpdateEvent(); err != nil { - ctx.Handle(500, "setting.WebHooksAddPost(UpdateEvent)", err) + ctx.Handle(500, "UpdateEvent", err) return } else if err := models.CreateWebhook(w); err != nil { - ctx.Handle(500, "setting.WebHooksAddPost(CreateWebhook)", err) + ctx.Handle(500, "CreateWebhook", err) return } - ctx.Flash.Success("New webhook has been added.") + ctx.Flash.Success(ctx.Tr("repo.settings.add_hook_success")) ctx.Redirect(ctx.Repo.RepoLink + "/settings/hooks") } func WebHooksEdit(ctx *middleware.Context) { - ctx.Data["IsRepoToolbarWebHooks"] = true - ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhook" + ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["PageIsSettingsHooks"] = true + ctx.Data["PageIsSettingsHooksEdit"] = true hookId := com.StrTo(ctx.Params(":id")).MustInt64() if hookId == 0 { @@ -296,21 +299,21 @@ func WebHooksEdit(ctx *middleware.Context) { w, err := models.GetWebhookById(hookId) if err != nil { if err == models.ErrWebhookNotExist { - ctx.Handle(404, "setting.WebHooksEdit(GetWebhookById)", nil) + ctx.Handle(404, "GetWebhookById", nil) } else { - ctx.Handle(500, "setting.WebHooksEdit(GetWebhookById)", err) + ctx.Handle(500, "GetWebhookById", err) } return } - w.GetEvent() ctx.Data["Webhook"] = w - ctx.HTML(200, HOOK_EDIT) + ctx.HTML(200, HOOK_NEW) } func WebHooksEditPost(ctx *middleware.Context, form auth.NewWebhookForm) { - ctx.Data["IsRepoToolbarWebHooks"] = true - ctx.Data["Title"] = strings.TrimPrefix(ctx.Repo.RepoLink, "/") + " - Webhook" + ctx.Data["Title"] = ctx.Tr("repo.settings") + ctx.Data["PageIsSettingsHooks"] = true + ctx.Data["PageIsSettingsHooksEdit"] = true hookId := com.StrTo(ctx.Params(":id")).MustInt64() if hookId == 0 { @@ -327,9 +330,11 @@ func WebHooksEditPost(ctx *middleware.Context, form auth.NewWebhookForm) { } return } + w.GetEvent() + ctx.Data["Webhook"] = w if ctx.HasError() { - ctx.HTML(200, HOOK_EDIT) + ctx.HTML(200, HOOK_NEW) return } @@ -338,7 +343,7 @@ func WebHooksEditPost(ctx *middleware.Context, form auth.NewWebhookForm) { ct = models.FORM } - w.Url = form.Url + w.Url = form.PayloadUrl w.ContentType = ct w.Secret = form.Secret w.HookEvent = &models.HookEvent{ @@ -353,6 +358,6 @@ func WebHooksEditPost(ctx *middleware.Context, form auth.NewWebhookForm) { return } - ctx.Flash.Success("Webhook has been updated.") + ctx.Flash.Success(ctx.Tr("repo.settings.update_hook_success")) ctx.Redirect(fmt.Sprintf("%s/settings/hooks/%d", ctx.Repo.RepoLink, hookId)) } diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl index a4b54fef2e1c..ea716e321a5d 100644 --- a/templates/repo/create.tmpl +++ b/templates/repo/create.tmpl @@ -71,8 +71,8 @@ {{.i18n.Tr "repo.init_readme"}}
- - + + {{.i18n.Tr "cancel"}}
diff --git a/templates/repo/hook_add.tmpl b/templates/repo/hook_add.tmpl deleted file mode 100644 index df3ff3bdf41f..000000000000 --- a/templates/repo/hook_add.tmpl +++ /dev/null @@ -1,62 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -{{template "repo/nav" .}} -{{template "repo/toolbar" .}} -
- {{template "repo/setting_nav" .}} -
- {{template "base/alert" .}} -
- {{.CsrfTokenHtml}} -
-
- Add Webhook -
- -
-
-

We’ll send a POST request to the URL below with details of any subscribed events.

-
-
- - -
- -
- - -
- -
- - -
-
-
- -
- -
-
-
-
- -

We will deliver event details when this hook is triggered.

-
-
-
- -
- -
-
-
-
-
-{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/repo/hook_edit.tmpl b/templates/repo/hook_edit.tmpl deleted file mode 100644 index c3fe217e37ae..000000000000 --- a/templates/repo/hook_edit.tmpl +++ /dev/null @@ -1,72 +0,0 @@ -{{template "base/head" .}} -{{template "base/navbar" .}} -{{template "repo/nav" .}} -{{template "repo/toolbar" .}} -
- {{template "repo/setting_nav" .}} -
- {{template "base/alert" .}} -
- {{.CsrfTokenHtml}} -
-
- Manage Webhook -
- -
-
-

We’ll send a POST request to the URL below with details of any subscribed events.

-
-
- - -
- -
- - -
- -
- - -
-
-
- -
- -
-
-
-
- -

We will deliver event details when this hook is triggered.

-
-
-
- -
-    - Delete Webhook -
-
-
-
-
-

Recent Deliveries

-
- -
- Coming soon -
-
-
-
-{{template "base/footer" .}} \ No newline at end of file diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl new file mode 100644 index 000000000000..917e6d1b72de --- /dev/null +++ b/templates/repo/settings/hook_new.tmpl @@ -0,0 +1,68 @@ +{{template "ng/base/head" .}} +{{template "ng/base/header" .}} +
+ {{template "repo/header" .}} +
+
+ {{template "repo/settings/nav" .}} +
+
+ {{template "ng/base/alert" .}} +
+
+
+ {{if .PageIsSettingsHooksNew}}{{.i18n.Tr "repo.settings.add_webhook"}}{{else}}{{.i18n.Tr "repo.settings.update_webhook"}}{{end}} +
+
+ {{.CsrfTokenHtml}} +
{{.i18n.Tr "repo.settings.add_webhook_desc" | Str2html}}
+
+ + +
+
+ + +
+
+ + +
+
+

{{.i18n.Tr "repo.settings.event_desc"}}

+ + {{.i18n.Tr "repo.settings.event_push_only" | Str2html}} +
+
+ + + {{.i18n.Tr "repo.settings.active_helper"}} +
+
+ + + {{if .PageIsSettingsHooksEdit}}{{.i18n.Tr "repo.settings.delete_webhook"}}{{end}} +
+
+
+
+
+
+
+
+ {{.i18n.Tr "repo.settings.recent_deliveries"}} +
+
    +
  • Coming soon!
    • +
+
+
+
+
+
+
+
+{{template "ng/base/footer" .}} \ No newline at end of file diff --git a/templates/repo/settings/hooks.tmpl b/templates/repo/settings/hooks.tmpl index 7081e78f918c..6efd8f0a6f76 100644 --- a/templates/repo/settings/hooks.tmpl +++ b/templates/repo/settings/hooks.tmpl @@ -18,7 +18,11 @@
  • {{.i18n.Tr "repo.settings.hooks_desc" | Str2html}}
    • {{range .Webhooks}}
  • - {{if .IsActive}}{{else}}{{end}} + {{if .IsActive}} + + {{else}} + + {{end}} {{.Url}} diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index ec0503e67755..e6ebb9aa22bf 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -31,8 +31,8 @@

    - - {{if .Repository.DefaultBranch}}{{end}} {{range .Branches}} {{if not (eq . $.Repository.DefaultBranch)}}{{end}} diff --git a/templates/user/settings/sshkeys.tmpl b/templates/user/settings/sshkeys.tmpl index ed54cbf5b6ec..3db0f54bbbda 100644 --- a/templates/user/settings/sshkeys.tmpl +++ b/templates/user/settings/sshkeys.tmpl @@ -16,7 +16,7 @@
  • {{.i18n.Tr "settings.ssh_desc"}}
    • {{range .Keys}}
  • - +

    {{.Name}}