From 6563b3b7c31d943c1cd8f7422534ead32c4e5763 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: 2025年8月22日 11:30:52 -0700 Subject: [PATCH] Group repository settings collaborators, deploy keys and public access as access management --- options/locale/locale_en-US.ini | 1 + routers/web/repo/setting/lfs.go | 10 +++---- routers/web/repo/setting/public_access.go | 2 +- routers/web/repo/setting/secrets.go | 2 +- routers/web/repo/setting/setting.go | 4 +-- routers/web/shared/actions/runners.go | 4 +-- routers/web/shared/actions/variables.go | 2 +- .../settings/{ => access}/collaboration.tmpl | 0 .../settings/{ => access}/deploy_keys.tmpl | 0 .../settings/{ => access}/public_access.tmpl | 0 .../repo/settings/{ => actions}/actions.tmpl | 0 .../settings/{ => actions}/runner_edit.tmpl | 0 .../repo/settings/{ => actions}/secrets.tmpl | 0 templates/repo/settings/{ => lfs}/lfs.tmpl | 0 .../repo/settings/{ => lfs}/lfs_file.tmpl | 0 .../settings/{ => lfs}/lfs_file_find.tmpl | 0 .../repo/settings/{ => lfs}/lfs_locks.tmpl | 0 .../repo/settings/{ => lfs}/lfs_pointers.tmpl | 0 templates/repo/settings/navbar.tmpl | 29 ++++++++++++------- 19 files changed, 31 insertions(+), 23 deletions(-) rename templates/repo/settings/{ => access}/collaboration.tmpl (100%) rename templates/repo/settings/{ => access}/deploy_keys.tmpl (100%) rename templates/repo/settings/{ => access}/public_access.tmpl (100%) rename templates/repo/settings/{ => actions}/actions.tmpl (100%) rename templates/repo/settings/{ => actions}/runner_edit.tmpl (100%) rename templates/repo/settings/{ => actions}/secrets.tmpl (100%) rename templates/repo/settings/{ => lfs}/lfs.tmpl (100%) rename templates/repo/settings/{ => lfs}/lfs_file.tmpl (100%) rename templates/repo/settings/{ => lfs}/lfs_file_find.tmpl (100%) rename templates/repo/settings/{ => lfs}/lfs_locks.tmpl (100%) rename templates/repo/settings/{ => lfs}/lfs_pointers.tmpl (100%) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 315241a4174ab..ee898e874cd67 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2157,6 +2157,7 @@ contributors.contribution_type.deletions = Deletions settings = Settings settings.desc = Settings is where you can manage the settings for the repository. settings.options = Repository +settings.access_management = Access Management settings.public_access = Public Access settings.public_access_desc = Configure public visitor's access permissions to override the defaults of this repository. settings.public_access.docs.not_set = Not Set: no extra public access permission. The visitor's permission follows the repository's visibility and member permissions. diff --git a/routers/web/repo/setting/lfs.go b/routers/web/repo/setting/lfs.go index af6708e841f46..ab625337a219a 100644 --- a/routers/web/repo/setting/lfs.go +++ b/routers/web/repo/setting/lfs.go @@ -32,11 +32,11 @@ import ( ) const ( - tplSettingsLFS templates.TplName = "repo/settings/lfs" - tplSettingsLFSLocks templates.TplName = "repo/settings/lfs_locks" - tplSettingsLFSFile templates.TplName = "repo/settings/lfs_file" - tplSettingsLFSFileFind templates.TplName = "repo/settings/lfs_file_find" - tplSettingsLFSPointers templates.TplName = "repo/settings/lfs_pointers" + tplSettingsLFS templates.TplName = "repo/settings/lfs/lfs" + tplSettingsLFSLocks templates.TplName = "repo/settings/lfs/lfs_locks" + tplSettingsLFSFile templates.TplName = "repo/settings/lfs/lfs_file" + tplSettingsLFSFileFind templates.TplName = "repo/settings/lfs/lfs_file_find" + tplSettingsLFSPointers templates.TplName = "repo/settings/lfs/lfs_pointers" ) // LFSFiles shows a repository's LFS files diff --git a/routers/web/repo/setting/public_access.go b/routers/web/repo/setting/public_access.go index 368d34294a26c..8d1756dc946de 100644 --- a/routers/web/repo/setting/public_access.go +++ b/routers/web/repo/setting/public_access.go @@ -16,7 +16,7 @@ import ( "code.gitea.io/gitea/services/context" ) -const tplRepoSettingsPublicAccess templates.TplName = "repo/settings/public_access" +const tplRepoSettingsPublicAccess templates.TplName = "repo/settings/access/public_access" func parsePublicAccessMode(permission string, allowed []string) (ret struct { AnonymousAccessMode, EveryoneAccessMode perm.AccessMode diff --git a/routers/web/repo/setting/secrets.go b/routers/web/repo/setting/secrets.go index c6e2d18249c2d..18b4686c4bbec 100644 --- a/routers/web/repo/setting/secrets.go +++ b/routers/web/repo/setting/secrets.go @@ -17,7 +17,7 @@ import ( const ( // TODO: Separate secrets from runners when layout is ready - tplRepoSecrets templates.TplName = "repo/settings/actions" + tplRepoSecrets templates.TplName = "repo/settings/actions/actions" tplOrgSecrets templates.TplName = "org/settings/actions" tplUserSecrets templates.TplName = "user/settings/actions" ) diff --git a/routers/web/repo/setting/setting.go b/routers/web/repo/setting/setting.go index 0865d9d7c0f59..4c879071e39af 100644 --- a/routers/web/repo/setting/setting.go +++ b/routers/web/repo/setting/setting.go @@ -41,11 +41,11 @@ import ( const ( tplSettingsOptions templates.TplName = "repo/settings/options" - tplCollaboration templates.TplName = "repo/settings/collaboration" + tplCollaboration templates.TplName = "repo/settings/access/collaboration" tplBranches templates.TplName = "repo/settings/branches" tplGithooks templates.TplName = "repo/settings/githooks" tplGithookEdit templates.TplName = "repo/settings/githook_edit" - tplDeployKeys templates.TplName = "repo/settings/deploy_keys" + tplDeployKeys templates.TplName = "repo/settings/access/deploy_keys" ) // SettingsCtxData is a middleware that sets all the general context data for the diff --git a/routers/web/shared/actions/runners.go b/routers/web/shared/actions/runners.go index 648f8046a49c9..6b8289ca35ae3 100644 --- a/routers/web/shared/actions/runners.go +++ b/routers/web/shared/actions/runners.go @@ -22,11 +22,11 @@ import ( const ( // TODO: Separate secrets from runners when layout is ready - tplRepoRunners templates.TplName = "repo/settings/actions" + tplRepoRunners templates.TplName = "repo/settings/actions/actions" tplOrgRunners templates.TplName = "org/settings/actions" tplAdminRunners templates.TplName = "admin/actions" tplUserRunners templates.TplName = "user/settings/actions" - tplRepoRunnerEdit templates.TplName = "repo/settings/runner_edit" + tplRepoRunnerEdit templates.TplName = "repo/settings/actions/runner_edit" tplOrgRunnerEdit templates.TplName = "org/settings/runners_edit" tplAdminRunnerEdit templates.TplName = "admin/runners/edit" tplUserRunnerEdit templates.TplName = "user/settings/runner_edit" diff --git a/routers/web/shared/actions/variables.go b/routers/web/shared/actions/variables.go index a43c2c2690bc0..917ebddc2d3f6 100644 --- a/routers/web/shared/actions/variables.go +++ b/routers/web/shared/actions/variables.go @@ -20,7 +20,7 @@ import ( ) const ( - tplRepoVariables templates.TplName = "repo/settings/actions" + tplRepoVariables templates.TplName = "repo/settings/actions/actions" tplOrgVariables templates.TplName = "org/settings/actions" tplUserVariables templates.TplName = "user/settings/actions" tplAdminVariables templates.TplName = "admin/actions" diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/access/collaboration.tmpl similarity index 100% rename from templates/repo/settings/collaboration.tmpl rename to templates/repo/settings/access/collaboration.tmpl diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/access/deploy_keys.tmpl similarity index 100% rename from templates/repo/settings/deploy_keys.tmpl rename to templates/repo/settings/access/deploy_keys.tmpl diff --git a/templates/repo/settings/public_access.tmpl b/templates/repo/settings/access/public_access.tmpl similarity index 100% rename from templates/repo/settings/public_access.tmpl rename to templates/repo/settings/access/public_access.tmpl diff --git a/templates/repo/settings/actions.tmpl b/templates/repo/settings/actions/actions.tmpl similarity index 100% rename from templates/repo/settings/actions.tmpl rename to templates/repo/settings/actions/actions.tmpl diff --git a/templates/repo/settings/runner_edit.tmpl b/templates/repo/settings/actions/runner_edit.tmpl similarity index 100% rename from templates/repo/settings/runner_edit.tmpl rename to templates/repo/settings/actions/runner_edit.tmpl diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/actions/secrets.tmpl similarity index 100% rename from templates/repo/settings/secrets.tmpl rename to templates/repo/settings/actions/secrets.tmpl diff --git a/templates/repo/settings/lfs.tmpl b/templates/repo/settings/lfs/lfs.tmpl similarity index 100% rename from templates/repo/settings/lfs.tmpl rename to templates/repo/settings/lfs/lfs.tmpl diff --git a/templates/repo/settings/lfs_file.tmpl b/templates/repo/settings/lfs/lfs_file.tmpl similarity index 100% rename from templates/repo/settings/lfs_file.tmpl rename to templates/repo/settings/lfs/lfs_file.tmpl diff --git a/templates/repo/settings/lfs_file_find.tmpl b/templates/repo/settings/lfs/lfs_file_find.tmpl similarity index 100% rename from templates/repo/settings/lfs_file_find.tmpl rename to templates/repo/settings/lfs/lfs_file_find.tmpl diff --git a/templates/repo/settings/lfs_locks.tmpl b/templates/repo/settings/lfs/lfs_locks.tmpl similarity index 100% rename from templates/repo/settings/lfs_locks.tmpl rename to templates/repo/settings/lfs/lfs_locks.tmpl diff --git a/templates/repo/settings/lfs_pointers.tmpl b/templates/repo/settings/lfs/lfs_pointers.tmpl similarity index 100% rename from templates/repo/settings/lfs_pointers.tmpl rename to templates/repo/settings/lfs/lfs_pointers.tmpl diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 3dd86d1f6a3a4..63a4d56993bf1 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -4,14 +4,24 @@ {{ctx.Locale.Tr "repo.settings.options"}} - {{if or .Repository.IsPrivate .Permission.HasAnyUnitPublicAccess}} - - {{ctx.Locale.Tr "repo.settings.public_access"}} - - {{end}} - - {{ctx.Locale.Tr "repo.settings.collaboration"}} - +
+ {{ctx.Locale.Tr "repo.settings.access_management"}} +
+ + {{ctx.Locale.Tr "repo.settings.collaboration"}} + + {{if .Repository.UnitEnabled ctx ctx.Consts.RepoUnitTypeCode}} + + {{ctx.Locale.Tr "repo.settings.deploy_keys"}} + + {{end}} + {{if or .Repository.IsPrivate .Permission.HasAnyUnitPublicAccess}} + + {{ctx.Locale.Tr "repo.settings.public_access"}} + + {{end}} +
+
{{if not DisableWebhooks}} {{ctx.Locale.Tr "repo.settings.hooks"}} @@ -29,9 +39,6 @@ {{ctx.Locale.Tr "repo.settings.githooks"}} {{end}} - - {{ctx.Locale.Tr "repo.settings.deploy_keys"}} - {{if .LFSStartServer}} {{ctx.Locale.Tr "repo.settings.lfs"}}

AltStyle によって変換されたページ (->オリジナル) /