From 43a8547df6e3a186b3b8430cd9856f612047a50a Mon Sep 17 00:00:00 2001 From: Xinyu Zhou Date: Thu, 27 Oct 2022 12:34:32 +0800 Subject: [PATCH] Added check for disabled Packages (#21540) (#21614) Backport #21540 At the moment, If admin disable Packages, still show the Packages on the admin dashboard. This patch added a check to hide the Packages entry. --- routers/web/web.go | 2 ++ templates/admin/navbar.tmpl | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/routers/web/web.go b/routers/web/web.go index b604337715..e4fea38244 100644 --- a/routers/web/web.go +++ b/routers/web/web.go @@ -566,6 +566,8 @@ func RegisterRoutes(m *web.Route) { m.Post("/delete", admin.DeleteNotices) m.Post("/empty", admin.EmptyNotices) }) + }, func(ctx *context.Context) { + ctx.Data["EnablePackages"] = setting.Packages.Enabled }, adminReq) // ***** END: Admin ***** diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 24a0a093a6..e523da7e7a 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -12,9 +12,11 @@ {{.i18n.Tr "admin.repositories"}} - - {{.i18n.Tr "packages.title"}} - + {{if .EnablePackages}} + + {{.i18n.Tr "packages.title"}} + + {{end}} {{if not DisableWebhooks}} {{.i18n.Tr "admin.hooks"}}