diff options
| -rw-r--r-- | config/default.json | 2 | ||||
| -rw-r--r-- | model/config.go | 6 | ||||
| -rw-r--r-- | utils/config.go | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/config/default.json b/config/default.json index 7b9820aff..740edee6b 100644 --- a/config/default.json +++ b/config/default.json @@ -83,7 +83,7 @@ "EnableConfirmNotificationsToChannel": true, "TeammateNameDisplay": "username", "ExperimentalTownSquareIsReadOnly": false, - "DefaultTeamName": "" + "ExperimentalPrimaryTeam": "" }, "ClientRequirements": { "AndroidLatestVersion": "", diff --git a/model/config.go b/model/config.go index d18874ea1..fb34d1a04 100644 --- a/model/config.go +++ b/model/config.go @@ -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("") } } diff --git a/utils/config.go b/utils/config.go index 5dcceba75..e2622cff9 100644 --- a/utils/config.go +++ b/utils/config.go @@ -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 |