Allow default team to be configured (#7846)

This commit is contained in:
Chris Duarte
2017-12-19 10:12:25 -08:00
committed by Christopher Speller
parent 917e2417cf
commit 15347b5527
3 changed files with 4 additions and 1 deletions

View File

@@ -82,7 +82,8 @@
"MaxNotificationsPerChannel": 1000,
"EnableConfirmNotificationsToChannel": true,
"TeammateNameDisplay": "username",
"ExperimentalTownSquareIsReadOnly": false
"ExperimentalTownSquareIsReadOnly": false,
"DefaultTeamName": ""
},
"ClientRequirements": {
"AndroidLatestVersion": "",

View File

@@ -925,6 +925,7 @@ type TeamSettings struct {
EnableConfirmNotificationsToChannel *bool
TeammateNameDisplay *string
ExperimentalTownSquareIsReadOnly *bool
DefaultTeamName *string
}
func (s *TeamSettings) SetDefaults() {

View File

@@ -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