diff options
| -rw-r--r-- | config/default.json | 3 | ||||
| -rw-r--r-- | model/config.go | 1 | ||||
| -rw-r--r-- | utils/config.go | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/config/default.json b/config/default.json index d772f2576..e264a7c3d 100644 --- a/config/default.json +++ b/config/default.json @@ -82,7 +82,8 @@ "MaxNotificationsPerChannel": 1000, "EnableConfirmNotificationsToChannel": true, "TeammateNameDisplay": "username", - "ExperimentalTownSquareIsReadOnly": false + "ExperimentalTownSquareIsReadOnly": false, + "DefaultTeamName": "" }, "ClientRequirements": { "AndroidLatestVersion": "", diff --git a/model/config.go b/model/config.go index 918d15b9a..71b76096f 100644 --- a/model/config.go +++ b/model/config.go @@ -925,6 +925,7 @@ type TeamSettings struct { EnableConfirmNotificationsToChannel *bool TeammateNameDisplay *string ExperimentalTownSquareIsReadOnly *bool + DefaultTeamName *string } func (s *TeamSettings) SetDefaults() { diff --git a/utils/config.go b/utils/config.go index 180bd7fea..8435c36cf 100644 --- a/utils/config.go +++ b/utils/config.go @@ -463,6 +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["AndroidLatestVersion"] = c.ClientRequirements.AndroidLatestVersion props["AndroidMinVersion"] = c.ClientRequirements.AndroidMinVersion |