diff --git a/custom/conf/app.example.ini b/custom/conf/app.example.ini
index 1e9614198c7..c4c0a6256ff 100644
--- a/custom/conf/app.example.ini
+++ b/custom/conf/app.example.ini
@@ -941,6 +941,10 @@ LEVEL = Info
;; True will make the membership of the users visible when added to the organisation
;DEFAULT_ORG_MEMBER_VISIBLE = false
;;
+;; Either "public", "limited" or "private", default is "private"
+;; Sets the default visibility for newly created teams within an organization
+;DEFAULT_TEAM_VISIBILITY = private
+;;
;; Default value for EnableDependencies
;; Repositories will use dependencies by default depending on this setting
;DEFAULT_ENABLE_DEPENDENCIES = true
diff --git a/modules/setting/service.go b/modules/setting/service.go
index 145541a25b5..073f1e1d419 100644
--- a/modules/setting/service.go
+++ b/modules/setting/service.go
@@ -27,6 +27,7 @@ var Service = struct {
DefaultUserVisibilityMode structs.VisibleType `ini:"-"`
AllowedUserVisibilityModesSlice AllowedVisibility `ini:"-"`
DefaultOrgVisibilityMode structs.VisibleType `ini:"-"`
+ DefaultTeamVisibilityMode structs.VisibleType `ini:"-"`
ActiveCodeLives int
ResetPwdCodeLives int
RegisterEmailConfirm bool
@@ -238,6 +239,9 @@ func loadServiceFrom(rootCfg ConfigProvider) {
Service.DefaultOrgVisibilityMode = structs.VisibilityModes[defaultOrgVisibility]
Service.DefaultOrgMemberVisible = sec.Key("DEFAULT_ORG_MEMBER_VISIBLE").MustBool()
+ defaultTeamVisibility := structs.VisibilityString(sec.Key("DEFAULT_TEAM_VISIBILITY").In("private", structs.VisibilityModeKeys()))
+ Service.DefaultTeamVisibilityMode = structs.VisibilityModes[defaultTeamVisibility]
+
Service.UserDeleteWithCommentsMaxTime = sec.Key("USER_DELETE_WITH_COMMENTS_MAX_TIME").MustDuration(0)
sec.Key("VALID_SITE_URL_SCHEMES").MustString("http,https") // FIXME: INI-MUST-SIDE-EFFECT
Service.ValidSiteURLSchemes = sec.Key("VALID_SITE_URL_SCHEMES").Strings(",")
diff --git a/modules/structs/org_team.go b/modules/structs/org_team.go
index 564bcd75e14..1e38691301c 100644
--- a/modules/structs/org_team.go
+++ b/modules/structs/org_team.go
@@ -62,7 +62,7 @@ type CreateTeamOption struct {
UnitsMap map[string]string `json:"units_map"`
// Whether the team can create repositories in the organization
CanCreateOrgRepo bool `json:"can_create_org_repo"`
- // Team visibility within the organization. Defaults to "private".
+ // Team visibility within the organization. Defaults to the instance's default team visibility, "private" unless configured.
Visibility TeamVisibility `json:"visibility" binding:"In(public,limited,private)"`
}
diff --git a/routers/api/v1/org/team.go b/routers/api/v1/org/team.go
index d9ab45ff853..89d39395b28 100644
--- a/routers/api/v1/org/team.go
+++ b/routers/api/v1/org/team.go
@@ -17,6 +17,7 @@ import (
unit_model "gitea.dev/models/unit"
user_model "gitea.dev/models/user"
"gitea.dev/modules/log"
+ "gitea.dev/modules/setting"
api "gitea.dev/modules/structs"
"gitea.dev/modules/util"
"gitea.dev/modules/web"
@@ -210,13 +211,17 @@ func CreateTeam(ctx *context.APIContext) {
// default:
// "$ref": "#/responses/error"
form := web.GetForm[*api.CreateTeamOption](ctx)
+ visibility := setting.Service.DefaultTeamVisibilityMode
+ if form.Visibility != "" {
+ visibility = organization.NormalizeTeamVisibility(form.Visibility)
+ }
team := &organization.Team{
OrgID: ctx.Org.Organization.ID,
Name: form.Name,
Description: form.Description,
IncludesAllRepositories: form.IncludesAllRepositories,
CanCreateOrgRepo: form.CanCreateOrgRepo,
- Visibility: organization.NormalizeTeamVisibility(form.Visibility),
+ Visibility: visibility,
}
_, err := assignTeamPermissionUnits(team, string(form.Permission), form.Units, form.UnitsMap)
if err != nil {
diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go
index 2a5ababa61b..7af6691a862 100644
--- a/routers/web/org/teams.go
+++ b/routers/web/org/teams.go
@@ -321,7 +321,7 @@ func NewTeam(ctx *context.Context) {
ctx.Data["Title"] = ctx.Org.Organization.FullName
ctx.Data["PageIsOrgTeams"] = true
ctx.Data["PageIsOrgTeamsNew"] = true
- ctx.Data["Team"] = &org_model.Team{}
+ ctx.Data["Team"] = &org_model.Team{Visibility: setting.Service.DefaultTeamVisibilityMode}
ctx.Data["Units"] = unit_model.Units
ctx.HTML(http.StatusOK, tplTeamNew)
}
diff --git a/templates/org/team/new.tmpl b/templates/org/team/new.tmpl
index 06b638ac28e..0b300a77865 100644
--- a/templates/org/team/new.tmpl
+++ b/templates/org/team/new.tmpl
@@ -44,7 +44,7 @@