rename DefaultTeamName to ExperimentalPrimaryTeam (#8039)

This commit is contained in:
Chris Duarte
2018-01-05 05:43:55 -08:00
committed by Joram Wilander
parent 45e372fb5b
commit 74eb82cfaa
3 changed files with 5 additions and 5 deletions

View File

@@ -83,7 +83,7 @@
"EnableConfirmNotificationsToChannel": true,
"TeammateNameDisplay": "username",
"ExperimentalTownSquareIsReadOnly": false,
"DefaultTeamName": ""
"ExperimentalPrimaryTeam": ""
},
"ClientRequirements": {
"AndroidLatestVersion": "",

View File

@@ -940,7 +940,7 @@ type TeamSettings struct {
EnableConfirmNotificationsToChannel *bool
TeammateNameDisplay *string
ExperimentalTownSquareIsReadOnly *bool
DefaultTeamName *string
ExperimentalPrimaryTeam *string
}
func (s *TeamSettings) SetDefaults() {
@@ -1037,8 +1037,8 @@ func (s *TeamSettings) SetDefaults() {
s.ExperimentalTownSquareIsReadOnly = NewBool(false)
}
if s.DefaultTeamName == nil {
s.DefaultTeamName = NewString("")
if s.ExperimentalPrimaryTeam == nil {
s.ExperimentalPrimaryTeam = NewString("")
}
}

View File

@@ -463,7 +463,7 @@ func getClientConfig(c *model.Config) map[string]string {
props["RestrictPrivateChannelManageMembers"] = *c.TeamSettings.RestrictPrivateChannelManageMembers
props["EnableXToLeaveChannelsFromLHS"] = strconv.FormatBool(*c.TeamSettings.EnableXToLeaveChannelsFromLHS)
props["TeammateNameDisplay"] = *c.TeamSettings.TeammateNameDisplay
props["DefaultTeamName"] = *c.TeamSettings.DefaultTeamName
props["ExperimentalPrimaryTeam"] = *c.TeamSettings.ExperimentalPrimaryTeam
props["AndroidLatestVersion"] = c.ClientRequirements.AndroidLatestVersion
props["AndroidMinVersion"] = c.ClientRequirements.AndroidMinVersion