diff --git a/routers/web/admin/runners.go b/routers/web/admin/runners.go index 65ebf5cc23..3d1db1a9be 100644 --- a/routers/web/admin/runners.go +++ b/routers/web/admin/runners.go @@ -21,9 +21,9 @@ import ( ) const ( - tplRunners base.TplName = "admin/runner/list" - tplRunnerNew base.TplName = "admin/runner/new" - tplRunnerEdit base.TplName = "admin/runner/edit" + tplRunners base.TplName = "runners/list" + tplRunnerNew base.TplName = "runners/new" + tplRunnerEdit base.TplName = "runners/edit" ) // Runners show all the runners diff --git a/routers/web/org/org_runners.go b/routers/web/org/org_runners.go new file mode 100644 index 0000000000..d7b6d47a17 --- /dev/null +++ b/routers/web/org/org_runners.go @@ -0,0 +1,26 @@ +package org + +import ( + "net/http" + + "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/context" +) + +// Runners render runners page +func Runners(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("org.settings") + ctx.Data["PageIsOrgSettings"] = true + ctx.Data["PageIsOrgSettingsRunners"] = true + ctx.Data["BaseLink"] = ctx.Org.OrgLink + "/settings/runners" + ctx.Data["Description"] = ctx.Tr("org.settings.runners_desc") + + ws, err := webhook.ListWebhooksByOpts(ctx, &webhook.ListWebhookOptions{OrgID: ctx.Org.Organization.ID}) + if err != nil { + ctx.ServerError("GetWebhooksByOrgId", err) + return + } + + ctx.Data["Webhooks"] = ws + ctx.HTML(http.StatusOK, tplSettingsRunners) +} diff --git a/routers/web/org/setting.go b/routers/web/org/setting.go index 3f7bc59856..1a54fa6e86 100644 --- a/routers/web/org/setting.go +++ b/routers/web/org/setting.go @@ -38,6 +38,8 @@ const ( tplSettingsHooks base.TplName = "org/settings/hooks" // tplSettingsLabels template path for render labels settings tplSettingsLabels base.TplName = "org/settings/labels" + // tplSettingsRunners template path for render runners settings + tplSettingsRunners base.TplName = "org/settings/runners" ) // Settings render the main settings page diff --git a/routers/web/repo/runners.go b/routers/web/repo/runners.go new file mode 100644 index 0000000000..f6bd497035 --- /dev/null +++ b/routers/web/repo/runners.go @@ -0,0 +1,26 @@ +package repo + +import ( + "net/http" + + "code.gitea.io/gitea/models/webhook" + "code.gitea.io/gitea/modules/context" +) + +// Runners render runners page +func Runners(ctx *context.Context) { + ctx.Data["Title"] = ctx.Tr("repo.settings.hooks") + ctx.Data["PageIsSettingsHooks"] = true + ctx.Data["BaseLink"] = ctx.Repo.RepoLink + "/settings/hooks" + ctx.Data["BaseLinkNew"] = ctx.Repo.RepoLink + "/settings/hooks" + ctx.Data["Description"] = ctx.Tr("repo.settings.hooks_desc", "https://docs.gitea.io/en-us/webhooks/") + + ws, err := webhook.ListWebhooksByOpts(ctx, &webhook.ListWebhookOptions{RepoID: ctx.Repo.Repository.ID}) + if err != nil { + ctx.ServerError("GetWebhooksByRepoID", err) + return + } + ctx.Data["Webhooks"] = ws + + ctx.HTML(http.StatusOK, tplHooks) +} diff --git a/routers/web/web.go b/routers/web/web.go index 2dbaf26538..88c9cc6c9d 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -797,6 +797,10 @@ func RegisterRoutes(m *web.Route) { m.Post("/initialize", bindIgnErr(forms.InitializeLabelsForm{}), org.InitializeLabels) }) + m.Group("/runners", func() { + m.Get("", org.Runners) + }) + m.Route("/delete", "GET,POST", org.SettingsDelete) m.Group("/packages", func() { @@ -950,6 +954,11 @@ func RegisterRoutes(m *web.Route) { m.Post("/{lid}/unlock", repo.LFSUnlock) }) }) + + m.Group("/runners", func() { + m.Get("", repo.Runners) + }) + }, func(ctx *context.Context) { ctx.Data["PageIsSettings"] = true ctx.Data["LFSStartServer"] = setting.LFS.StartServer diff --git a/templates/admin/runner/new.tmpl b/templates/admin/runner/new.tmpl deleted file mode 100644 index b8fd8c0ad1..0000000000 --- a/templates/admin/runner/new.tmpl +++ /dev/null @@ -1,94 +0,0 @@ -{{template "base/head" .}} -
- {{template "admin/navbar" .}} -
- {{template "base/alert" .}} -

- {{.locale.Tr "admin.users.new_account"}} -

-
-
- {{template "base/disable_form_autofill"}} - {{.CsrfTokenHtml}} - -
- - -
- -
- - -
- -
- - -
-
- - -
-
- - -
-
- - -
- -
-
- - -
-
- - - {{if .CanSendEmail}} -
-
- - -
-
- {{end}} - -
- -
-
-
-
-
-{{template "base/footer" .}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 7df1c85903..8f21762175 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -22,6 +22,9 @@ {{.locale.Tr "packages.title"}} {{end}} + + {{.locale.Tr "repo.runners"}} + {{.locale.Tr "org.settings.delete"}} diff --git a/templates/org/settings/runners.tmpl b/templates/org/settings/runners.tmpl new file mode 100644 index 0000000000..cb0243bb1e --- /dev/null +++ b/templates/org/settings/runners.tmpl @@ -0,0 +1,13 @@ +{{template "base/head" .}} +
+ {{template "org/header" .}} +
+
+ {{template "org/settings/navbar" .}} +
+ {{template "repo/settings/webhook/list" .}} +
+
+
+
+{{template "base/footer" .}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 2a9202cf40..82ae250df1 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -32,5 +32,8 @@ {{.locale.Tr "repo.settings.lfs"}} {{end}} + + {{.locale.Tr "repo.settings.runners"}} + diff --git a/templates/admin/runner/edit.tmpl b/templates/runners/edit.tmpl similarity index 100% rename from templates/admin/runner/edit.tmpl rename to templates/runners/edit.tmpl diff --git a/templates/admin/runner/list.tmpl b/templates/runners/list.tmpl similarity index 100% rename from templates/admin/runner/list.tmpl rename to templates/runners/list.tmpl