tdsds.com/gitea
1
1
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2025-12-07 13:28:25 +00:00
Code Releases Activity

feat(runner): make admin runner template as common template, use for org runners setting

Browse Source
This commit is contained in:
fuxiaohei
2022-11-25 17:48:46 +08:00
committed by Jason Song
parent dca2ca2f47
commit 25fe4f6d9e
11 changed files with 414 additions and 214 deletions
Download Patch File Download Diff File Expand all files Collapse all files
routers/web/admin/runners.go
+11 -90
View File
@@ -6,9 +6,7 @@
package admin
import (
"net/http"
"net/url"
"strings"
bots_model "code.gitea.io/gitea/models/bots"
"code.gitea.io/gitea/models/db"
@@ -16,14 +14,13 @@ import (
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/web"
"code.gitea.io/gitea/services/forms"
"code.gitea.io/gitea/routers/common"
)
const (
tplRunners base.TplName = "runners/list"
tplRunnerNew base.TplName = "runners/new"
tplRunnerEdit base.TplName = "runners/edit"
tplRunners base.TplName = "admin/runners/base"
tplRunnerNew base.TplName = "admin/runners/new"
tplRunnerEdit base.TplName = "admin/runners/edit"
)
// Runners show all the runners
@@ -45,49 +42,11 @@ func Runners(ctx *context.Context) {
Sort: ctx.Req.URL.Query().Get("sort"),
Filter: ctx.Req.URL.Query().Get("q"),
WithDeleted: false,
RepoID: 0,
OwnerID: 0,
}
count, err := bots_model.CountRunners(opts)
if err != nil {
ctx.ServerError("AdminRunners", err)
return
}
runners, err := bots_model.FindRunners(opts)
if err != nil {
ctx.ServerError("AdminRunners", err)
return
}
if err := runners.LoadAttributes(ctx); err != nil {
ctx.ServerError("LoadAttributes", err)
return
}
// ownid=0,repo_id=0,means this token is used for global
var token *bots_model.RunnerToken
token, err = bots_model.GetUnactivatedRunnerToken(0, 0)
if _, ok := err.(bots_model.ErrRunnerTokenNotExist); ok {
token, err = bots_model.NewRunnerToken(0, 0)
if err != nil {
ctx.ServerError("CreateRunnerToken", err)
return
}
} else {
if err != nil {
ctx.ServerError("GetUnactivatedRunnerToken", err)
return
}
}
ctx.Data["Keyword"] = opts.Filter
ctx.Data["Runners"] = runners
ctx.Data["Total"] = count
ctx.Data["RegistrationToken"] = token.Token
pager := context.NewPagination(int(count), opts.PageSize, opts.Page, 5)
ctx.Data["Page"] = pager
ctx.HTML(http.StatusOK, tplRunners)
common.RunnersList(ctx, tplRunners, opts)
}
// EditRunner show editing runner page
@@ -96,47 +55,16 @@ func EditRunner(ctx *context.Context) {
ctx.Data["PageIsAdmin"] = true
ctx.Data["PageIsAdminRunners"] = true
runner, err := bots_model.GetRunnerByID(ctx.ParamsInt64(":runnerid"))
if err != nil {
ctx.ServerError("GetRunnerByID", err)
return
}
ctx.Data["Runner"] = runner
// TODO: get task list for this runner
ctx.HTML(http.StatusOK, tplRunnerEdit)
common.RunnerDetails(ctx, tplRunnerEdit, ctx.ParamsInt64(":runnerid"))
}
// EditRunnerPost response for editing runner
func EditRunnerPost(ctx *context.Context) {
runner, err := bots_model.GetRunnerByID(ctx.ParamsInt64(":runnerid"))
if err != nil {
log.Warn("EditRunnerPost.GetRunnerByID failed: %v, url: %s", err, ctx.Req.URL)
ctx.ServerError("EditRunnerPost.GetRunnerByID", err)
return
}
form := web.GetForm(ctx).(*forms.AdminEditRunnerForm)
runner.Description = form.Description
runner.CustomLabels = strings.Split(form.CustomLabels, ",")
err = bots_model.UpdateRunner(ctx, runner, "description", "custom_labels")
if err != nil {
log.Warn("EditRunnerPost.UpdateRunner failed: %v, url: %s", err, ctx.Req.URL)
ctx.Flash.Warning(ctx.Tr("admin.runners.update_runner_failed"))
ctx.Redirect(setting.AppSubURL + "/admin/runners/" + url.PathEscape(ctx.Params(":runnerid")))
return
}
ctx.Data["Title"] = ctx.Tr("admin.runners.edit")
ctx.Data["PageIsAdmin"] = true
ctx.Data["PageIsAdminRunners"] = true
log.Debug("EditRunnerPost success: %s", ctx.Req.URL)
ctx.Flash.Success(ctx.Tr("admin.runners.update_runner_success"))
ctx.Redirect(setting.AppSubURL + "/admin/runners/" + url.PathEscape(ctx.Params(":runnerid")))
common.RunnerDetailsEditPost(ctx, ctx.ParamsInt64(":runnerid"),
setting.AppSubURL+"/admin/runners/"+url.PathEscape(ctx.Params(":runnerid")))
}
// DeleteRunner response for deleting a runner
@@ -163,14 +91,7 @@ func DeleteRunnerPost(ctx *context.Context) {
}
func ResetRunnerRegistrationToken(ctx *context.Context) {
_, err := bots_model.NewRunnerToken(0, 0)
if err != nil {
ctx.ServerError("ResetRunnerRegistrationToken", err)
return
}
ctx.Flash.Success(ctx.Tr("admin.runners.reset_registration_token_success"))
ctx.Redirect(setting.AppSubURL + "/admin/runners/")
common.RunnerResetRegistrationToken(ctx, 0, 0, setting.AppSubURL+"/admin/runners/")
}
/**
routers/web/org/org_runners.go
+27 -12
View File
@@ -1,26 +1,41 @@
package org
import (
"net/http"
"code.gitea.io/gitea/models/webhook"
bots_model "code.gitea.io/gitea/models/bots"
"code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/routers/common"
)
// Runners render runners page
func Runners(ctx *context.Context) {
ctx.Data["Title"] = ctx.Tr("org.settings")
ctx.Data["Title"] = ctx.Tr("org.runners")
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
page := ctx.FormInt("page")
if page <= 1 {
page = 1
}
ctx.Data["Webhooks"] = ws
ctx.HTML(http.StatusOK, tplSettingsRunners)
opts := bots_model.FindRunnerOptions{
ListOptions: db.ListOptions{
Page: page,
PageSize: 100,
},
Sort: ctx.Req.URL.Query().Get("sort"),
Filter: ctx.Req.URL.Query().Get("q"),
WithDeleted: false,
RepoID: 0,
OwnerID: ctx.Org.Organization.ID,
}
common.RunnersList(ctx, tplSettingsRunners, opts)
}
// ResetRunnerRegistrationToken reset runner registration token
func ResetRunnerRegistrationToken(ctx *context.Context) {
common.RunnerResetRegistrationToken(ctx,
ctx.Org.Organization.ID, 0,
ctx.Org.OrgLink+"/settings/runners")
}
routers/web/web.go
+2 -1
View File
@@ -628,7 +628,7 @@ func RegisterRoutes(m *web.Route) {
m.Group("/runners", func() {
m.Get("", admin.Runners)
m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken)
m.Combo("/{runnerid}").Get(admin.EditRunner).Post(bindIgnErr(forms.AdminEditRunnerForm{}), admin.EditRunnerPost)
m.Combo("/{runnerid}").Get(admin.EditRunner).Post(bindIgnErr(forms.EditRunnerForm{}), admin.EditRunnerPost)
m.Post("/{runnerid}/delete", admin.DeleteRunnerPost)
})
}, func(ctx *context.Context) {
@@ -799,6 +799,7 @@ func RegisterRoutes(m *web.Route) {
m.Group("/runners", func() {
m.Get("", org.Runners)
m.Get("/reset_registration_token", org.ResetRunnerRegistrationToken)
})
m.Route("/delete", "GET,POST", org.SettingsDelete)