From 5e9fd0ab5e3ce6428d6fe93c0c477fadb918e11f Mon Sep 17 00:00:00 2001 From: Giteabot Date: Thu, 11 Jan 2024 12:31:24 +0800 Subject: [PATCH] Hide code related setting options in repository when code unit is disabled (#28631) (#28749) Backport #28631 by @lunny Since #20805, code can be hidden. However, the related settings are still shown even though they don't have any meaning then. https://github.com/go-gitea/gitea/assets/81045/5fdee54d-ac81-418a-82f7-eadff048cedd Co-authored-by: Lunny Xiao --- templates/repo/settings/navbar.tmpl | 36 ++++++++++++++-------------- templates/repo/settings/options.tmpl | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index b16eb6076f..3bef0fa4c1 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -7,31 +7,31 @@ {{ctx.Locale.Tr "repo.settings.collaboration"}} - {{if not .Repository.IsEmpty}} - - {{ctx.Locale.Tr "repo.settings.branches"}} - - {{end}} - - {{ctx.Locale.Tr "repo.settings.tags"}} - {{if not DisableWebhooks}} {{ctx.Locale.Tr "repo.settings.hooks"}} {{end}} - {{if .SignedUser.CanEditGitHook}} - - {{ctx.Locale.Tr "repo.settings.githooks"}} + {{if and (.Repository.UnitEnabled $.Context $.UnitTypeCode) (not .Repository.IsEmpty)}} + + {{ctx.Locale.Tr "repo.settings.branches"}} - {{end}} - - {{ctx.Locale.Tr "repo.settings.deploy_keys"}} - - {{if .LFSStartServer}} - - {{ctx.Locale.Tr "repo.settings.lfs"}} + + {{ctx.Locale.Tr "repo.settings.tags"}} + {{if .SignedUser.CanEditGitHook}} + + {{ctx.Locale.Tr "repo.settings.githooks"}} + + {{end}} + + {{ctx.Locale.Tr "repo.settings.deploy_keys"}} + + {{if .LFSStartServer}} + + {{ctx.Locale.Tr "repo.settings.lfs"}} + + {{end}} {{end}} {{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}}
diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 5a32f5e7ae..8456bb409b 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -66,7 +66,7 @@ {{/* These variables exist to make the logic in the Settings window easier to comprehend and are not used later on. */}} {{$newMirrorsPartiallyEnabled := or (not .DisableNewPullMirrors) (not .DisableNewPushMirrors)}} {{/* .Repository.IsMirror is not always reliable if the repository is not actively acting as a mirror because of errors. */}} - {{$showMirrorSettings := or $newMirrorsPartiallyEnabled .Repository.IsMirror .PullMirror .PushMirrors}} + {{$showMirrorSettings := and (.Repository.UnitEnabled $.Context $.UnitTypeCode) (or $newMirrorsPartiallyEnabled .Repository.IsMirror .PullMirror .PushMirrors)}} {{$newMirrorsEntirelyEnabled := and (not .DisableNewPullMirrors) (not .DisableNewPushMirrors)}} {{$onlyNewPushMirrorsEnabled := and (not .DisableNewPushMirrors) .DisableNewPullMirrors}} {{$onlyNewPullMirrorsEnabled := and .DisableNewPushMirrors (not .DisableNewPullMirrors)}}