Skip to content

Commit 5fdac0d

Browse files
pboguslawskiearl-warren
authored andcommitted
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 <[email protected]> (cherry picked from commit c5dee88)
1 parent 75122ed commit 5fdac0d

File tree

5 files changed

+11
-3
lines changed

5 files changed

+11
-3
lines changed

routers/web/web.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ func RegisterRoutes(m *web.Route) {
480480
m.Get("", user_setting.Secrets)
481481
m.Post("", web.Bind(forms.AddSecretForm{}), user_setting.SecretsPost)
482482
m.Post("/delete", user_setting.SecretsDelete)
483-
})
483+
}, actions.MustEnableActions)
484484
m.Get("/organization", user_setting.Organization)
485485
m.Get("/repos", user_setting.Repos)
486486
m.Post("/repos/unadopted", user_setting.AdoptOrDeleteRepository)
@@ -858,7 +858,7 @@ func RegisterRoutes(m *web.Route) {
858858
m.Get("", org.Secrets)
859859
m.Post("", web.Bind(forms.AddSecretForm{}), org.SecretsPost)
860860
m.Post("/delete", org.SecretsDelete)
861-
})
861+
}, actions.MustEnableActions)
862862

863863
m.Route("/delete", "GET,POST", org.SettingsDelete)
864864

@@ -1051,7 +1051,7 @@ func RegisterRoutes(m *web.Route) {
10511051
m.Get("", repo.Secrets)
10521052
m.Post("", web.Bind(forms.AddSecretForm{}), repo.SecretsPost)
10531053
m.Post("/delete", repo.DeleteSecret)
1054-
})
1054+
}, actions.MustEnableActions)
10551055

10561056
m.Group("/lfs", func() {
10571057
m.Get("/", repo.LFSFiles)

templates/org/settings/navbar.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
<a class="{{if .PageIsOrgSettingsLabels}}active {{end}}item" href="{{.OrgLink}}/settings/labels">
1313
{{.locale.Tr "repo.labels"}}
1414
</a>
15+
{{if .EnableActions}}
1516
<a class="{{if .PageIsOrgSettingsSecrets}}active {{end}}item" href="{{.OrgLink}}/settings/secrets">
1617
{{.locale.Tr "secrets.secrets"}}
1718
</a>
19+
{{end}}
1820
{{if .EnableOAuth2}}
1921
<a class="{{if .PageIsSettingsApplications}}active {{end}}item" href="{{.OrgLink}}/settings/applications">
2022
{{.locale.Tr "settings.applications"}}

templates/repo/settings/nav.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@
1313
<li {{if .PageIsSettingsGitHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks/git">{{.locale.Tr "repo.settings.githooks"}}</a></li>
1414
{{end}}
1515
<li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.locale.Tr "repo.settings.deploy_keys"}}</a></li>
16+
{{if .EnableActions}}
1617
<li {{if .PageIsSettingsSecrets}}class="current"{{end}}><a href="{{.RepoLink}}/settings/secrets">{{.locale.Tr "secrets.secrets"}}</a></li>
18+
{{end}}
1719
</ul>
1820
</div>
1921
</div>

templates/repo/settings/navbar.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,11 @@
2727
<a class="{{if .PageIsSettingsKeys}}active {{end}}item" href="{{.RepoLink}}/settings/keys">
2828
{{.locale.Tr "repo.settings.deploy_keys"}}
2929
</a>
30+
{{if .EnableActions}}
3031
<a class="{{if .PageIsSettingsSecrets}}active {{end}}item" href="{{.RepoLink}}/settings/secrets">
3132
{{.locale.Tr "secrets.secrets"}}
3233
</a>
34+
{{end}}
3335
{{if .LFSStartServer}}
3436
<a class="{{if .PageIsSettingsLFS}}active {{end}}item" href="{{.RepoLink}}/settings/lfs">
3537
{{.locale.Tr "repo.settings.lfs"}}

templates/user/settings/navbar.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
<a class="{{if .PageIsSettingsKeys}}active {{end}}item" href="{{AppSubUrl}}/user/settings/keys">
1919
{{.locale.Tr "settings.ssh_gpg_keys"}}
2020
</a>
21+
{{if .EnableActions}}
2122
<a class="{{if .PageIsSettingsSecrets}}active {{end}}item" href="{{AppSubUrl}}/user/settings/secrets">
2223
{{.locale.Tr "secrets.secrets"}}
2324
</a>
25+
{{end}}
2426
{{if .EnablePackages}}
2527
<a class="{{if .PageIsSettingsPackages}}active {{end}}item" href="{{AppSubUrl}}/user/settings/packages">
2628
{{.locale.Tr "packages.title"}}

0 commit comments

Comments
 (0)