Hiding Secrets options when Actions feature is disabled (go-gitea#24792)

`Secrets` options should be hidden if `Actions` feature is disabled. This fixes in release/v1.19. In main probably fixed in 63a401a (didn't check). Fixes: 6590551 Author-Change-Id: IB#1134011 Signed-off-by: Pawel Boguslawski <pawel.boguslawski@ib.pl> (cherry picked from commit c5dee88)
Codeberg-org · May 30, 2023 · 5fdac0d · 5fdac0d
1 parent 75122ed
commit 5fdac0d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/routers/web/web.go b/routers/web/web.go
@@ -480,7 +480,7 @@ func RegisterRoutes(m *web.Route) {
 			m.Get("", user_setting.Secrets)
 			m.Post("", web.Bind(forms.AddSecretForm{}), user_setting.SecretsPost)
 			m.Post("/delete", user_setting.SecretsDelete)
-		})
+		}, actions.MustEnableActions)
 		m.Get("/organization", user_setting.Organization)
 		m.Get("/repos", user_setting.Repos)
 		m.Post("/repos/unadopted", user_setting.AdoptOrDeleteRepository)
@@ -858,7 +858,7 @@ func RegisterRoutes(m *web.Route) {
 					m.Get("", org.Secrets)
 					m.Post("", web.Bind(forms.AddSecretForm{}), org.SecretsPost)
 					m.Post("/delete", org.SecretsDelete)
-				})
+				}, actions.MustEnableActions)
 
 				m.Route("/delete", "GET,POST", org.SettingsDelete)
 
@@ -1051,7 +1051,7 @@ func RegisterRoutes(m *web.Route) {
 				m.Get("", repo.Secrets)
 				m.Post("", web.Bind(forms.AddSecretForm{}), repo.SecretsPost)
 				m.Post("/delete", repo.DeleteSecret)
-			})
+			}, actions.MustEnableActions)
 
 			m.Group("/lfs", func() {
 				m.Get("/", repo.LFSFiles)

diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl
@@ -12,9 +12,11 @@
 		<a class="{{if .PageIsOrgSettingsLabels}}active {{end}}item" href="{{.OrgLink}}/settings/labels">
 			{{.locale.Tr "repo.labels"}}
 		</a>
+		{{if .EnableActions}}
 		<a class="{{if .PageIsOrgSettingsSecrets}}active {{end}}item" href="{{.OrgLink}}/settings/secrets">
 			{{.locale.Tr "secrets.secrets"}}
 		</a>
+		{{end}}
 		{{if .EnableOAuth2}}
 		<a class="{{if .PageIsSettingsApplications}}active {{end}}item" href="{{.OrgLink}}/settings/applications">
 			{{.locale.Tr "settings.applications"}}

diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl
@@ -13,7 +13,9 @@
 				<li {{if .PageIsSettingsGitHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks/git">{{.locale.Tr "repo.settings.githooks"}}</a></li>
 			{{end}}
 			<li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.locale.Tr "repo.settings.deploy_keys"}}</a></li>
+			{{if .EnableActions}}
 			<li {{if .PageIsSettingsSecrets}}class="current"{{end}}><a href="{{.RepoLink}}/settings/secrets">{{.locale.Tr "secrets.secrets"}}</a></li>
+			{{end}}
 		</ul>
 	</div>
 </div>
diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl
@@ -27,9 +27,11 @@
 		<a class="{{if .PageIsSettingsKeys}}active {{end}}item" href="{{.RepoLink}}/settings/keys">
 			{{.locale.Tr "repo.settings.deploy_keys"}}
 		</a>
+		{{if .EnableActions}}
 		<a class="{{if .PageIsSettingsSecrets}}active {{end}}item" href="{{.RepoLink}}/settings/secrets">
 			{{.locale.Tr "secrets.secrets"}}
 		</a>
+		{{end}}
 		{{if .LFSStartServer}}
 			<a class="{{if .PageIsSettingsLFS}}active {{end}}item" href="{{.RepoLink}}/settings/lfs">
 				{{.locale.Tr "repo.settings.lfs"}}

diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl
@@ -18,9 +18,11 @@
 		<a class="{{if .PageIsSettingsKeys}}active {{end}}item" href="{{AppSubUrl}}/user/settings/keys">
 			{{.locale.Tr "settings.ssh_gpg_keys"}}
 		</a>
+		{{if .EnableActions}}
 		<a class="{{if .PageIsSettingsSecrets}}active {{end}}item" href="{{AppSubUrl}}/user/settings/secrets">
 			{{.locale.Tr "secrets.secrets"}}
 		</a>
+		{{end}}
 		{{if .EnablePackages}}
 		<a class="{{if .PageIsSettingsPackages}}active {{end}}item" href="{{AppSubUrl}}/user/settings/packages">
 			{{.locale.Tr "packages.title"}}