feat: support disable bots completely

This commit is contained in:
Jason Song
2022-12-01 15:27:28 +08:00
parent ab69fdc6fe
commit b2745bff43
8 changed files with 33 additions and 23 deletions
+6
View File
@@ -14,6 +14,7 @@ import (
"code.gitea.io/gitea/modules/bots"
"code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/convert"
"code.gitea.io/gitea/modules/setting"
"code.gitea.io/gitea/modules/util"
)
@@ -24,6 +25,11 @@ const (
// MustEnableBots check if bots are enabled in settings
func MustEnableBots(ctx *context.Context) {
if !setting.Bots.Enabled {
ctx.NotFound("MustEnableBots", nil)
return
}
if unit.TypeBots.UnitGlobalDisabled() {
ctx.NotFound("MustEnableBots", nil)
return
+3 -8
View File
@@ -629,7 +629,7 @@ func RegisterRoutes(m *web.Route) {
m.Get("/reset_registration_token", admin.ResetRunnerRegistrationToken)
m.Combo("/{runnerid}").Get(admin.EditRunner).Post(bindIgnErr(forms.EditRunnerForm{}), admin.EditRunnerPost)
m.Post("/{runnerid}/delete", admin.DeleteRunnerPost)
})
}, bots.MustEnableBots)
}, func(ctx *context.Context) {
ctx.Data["EnableOAuth2"] = setting.OAuth2.Enable
ctx.Data["EnablePackages"] = setting.Packages.Enabled
@@ -792,7 +792,7 @@ func RegisterRoutes(m *web.Route) {
Post(bindIgnErr(forms.EditRunnerForm{}), org.RunnersEditPost)
m.Post("/{runnerid}/delete", org.RunnerDeletePost)
m.Get("/reset_registration_token", org.ResetRunnerRegistrationToken)
})
}, bots.MustEnableBots)
m.Group("/secrets", func() {
m.Get("", org.Secrets)
@@ -800,11 +800,6 @@ func RegisterRoutes(m *web.Route) {
m.Post("/delete", org.SecretsDelete)
})
m.Group("/runners", func() {
m.Get("", org.Runners)
m.Get("/reset_registration_token", org.ResetRunnerRegistrationToken)
})
m.Route("/delete", "GET,POST", org.SettingsDelete)
m.Group("/packages", func() {
@@ -965,7 +960,7 @@ func RegisterRoutes(m *web.Route) {
Post(bindIgnErr(forms.EditRunnerForm{}), repo.RunnersEditPost)
m.Post("/{runnerid}/delete", repo.RunnerDeletePost)
m.Get("/reset_registration_token", repo.ResetRunnerRegistrationToken)
})
}, bots.MustEnableBots)
}, func(ctx *context.Context) {
ctx.Data["PageIsSettings"] = true
ctx.Data["LFSStartServer"] = setting.LFS.StartServer