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 @@
- + {{ctx.Locale.Tr "org.teams.visibility_private_helper"}}
diff --git a/templates/swagger/v1-openapi3.generated.json b/templates/swagger/v1-openapi3.generated.json index 30f4275d295..47c2eaf5184 100644 --- a/templates/swagger/v1-openapi3.generated.json +++ b/templates/swagger/v1-openapi3.generated.json @@ -5071,7 +5071,7 @@ "$ref": "#/components/schemas/TeamVisibility" } ], - "description": "Team visibility within the organization. Defaults to \"private\"." + "description": "Team visibility within the organization. Defaults to the instance's default team visibility, \"private\" unless configured." } }, "required": [ diff --git a/templates/swagger/v1-swagger.generated.json b/templates/swagger/v1-swagger.generated.json index 7cd9710e9e3..8e7780a348e 100644 --- a/templates/swagger/v1-swagger.generated.json +++ b/templates/swagger/v1-swagger.generated.json @@ -27547,7 +27547,7 @@ } }, "visibility": { - "description": "Team visibility within the organization. Defaults to \"private\".", + "description": "Team visibility within the organization. Defaults to the instance's default team visibility, \"private\" unless configured.", "type": "string", "enum": [ "public", diff --git a/tests/integration/api_team_test.go b/tests/integration/api_team_test.go index ef37b373e9f..fc157ef3e50 100644 --- a/tests/integration/api_team_test.go +++ b/tests/integration/api_team_test.go @@ -17,8 +17,10 @@ import ( "gitea.dev/models/repo" "gitea.dev/models/unittest" user_model "gitea.dev/models/user" + "gitea.dev/modules/setting" "gitea.dev/modules/structs" api "gitea.dev/modules/structs" + "gitea.dev/modules/test" "gitea.dev/services/convert" repo_service "gitea.dev/services/repository" "gitea.dev/tests" @@ -110,6 +112,7 @@ func TestAPITeam(t *testing.T) { org = unittest.AssertExistsAndLoadBean(t, &organization.Organization{ID: 6}) // Create team. + defer test.MockVariableValue(&setting.Service.DefaultTeamVisibilityMode, api.VisibleTypeLimited)() teamToCreate := &api.CreateTeamOption{ Name: "team1", Description: "team one", @@ -124,6 +127,7 @@ func TestAPITeam(t *testing.T) { expectedTeamUnitsMap := map[string]string{"repo.code": "read", "repo.issues": "read"} checkTeamResponse(t, "CreateTeam1", apiTeam, teamToCreate.Name, teamToCreate.Description, teamToCreate.IncludesAllRepositories, api.AccessLevelNameNone, expectedTeamUnitsMap) checkTeamBean(t, apiTeam.ID, teamToCreate.Name, teamToCreate.Description, teamToCreate.IncludesAllRepositories, api.AccessLevelNameNone, expectedTeamUnitsMap) + assert.Equal(t, api.TeamVisibilityLimited, apiTeam.Visibility) teamID := apiTeam.ID MakeRequest(t, NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams", org.Name), teamToCreate).AddTokenAuth(token), http.StatusConflict) @@ -187,6 +191,7 @@ func TestAPITeam(t *testing.T) { Description: "team two", IncludesAllRepositories: true, UnitsMap: map[string]string{"repo.code": "read", "repo.issues": "write", "repo.wiki": "none"}, + Visibility: api.TeamVisibilityPrivate, } req = NewRequestWithJSON(t, "POST", fmt.Sprintf("/api/v1/orgs/%s/teams", org.Name), teamToCreate). AddTokenAuth(token) @@ -194,6 +199,7 @@ func TestAPITeam(t *testing.T) { apiTeam = DecodeJSON(t, resp, &api.Team{}) checkTeamResponse(t, "CreateTeam2", apiTeam, teamToCreate.Name, teamToCreate.Description, teamToCreate.IncludesAllRepositories, api.AccessLevelNameNone, teamToCreate.UnitsMap) checkTeamBean(t, apiTeam.ID, teamToCreate.Name, teamToCreate.Description, teamToCreate.IncludesAllRepositories, api.AccessLevelNameNone, teamToCreate.UnitsMap) + assert.Equal(t, api.TeamVisibilityPrivate, apiTeam.Visibility) teamID = apiTeam.ID // Create a team with permission=write, then edit it to granular permissions later, team's permission should be reset to none diff --git a/tests/integration/org_test.go b/tests/integration/org_test.go index bfc6b116134..cd27e2ebba1 100644 --- a/tests/integration/org_test.go +++ b/tests/integration/org_test.go @@ -304,6 +304,14 @@ func testTeamsPage(t *testing.T) { req = NewRequestf(t, "GET", "/org/%s/teams", org.Name) nonMemberSession.MakeRequest(t, req, http.StatusNotFound) + t.Run("NewTeamDefaultVisibility", func(t *testing.T) { + defer test.MockVariableValue(&setting.Service.DefaultTeamVisibilityMode, api.VisibleTypeLimited)() + req := NewRequestf(t, "GET", "/org/%s/teams/new", org.Name) + checked := NewHTMLParser(t, ownerSession.MakeRequest(t, req, http.StatusOK).Body).Find(`input[name="visibility"][checked]`) + assert.Equal(t, 1, checked.Length()) + assert.Equal(t, "limited", checked.AttrOr("value", "")) + }) + t.Run("Pagination", func(t *testing.T) { defer test.MockVariableValue(&setting.UI.MembersPagingNum, 2)() assert.Len(t, listTeams(t, ownerSession, "?page=1"), 2)