Allow default team to be configured (#7846)
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
917e2417cf
Коммит
15347b5527
@@ -82,7 +82,8 @@
|
|||||||
"MaxNotificationsPerChannel": 1000,
|
"MaxNotificationsPerChannel": 1000,
|
||||||
"EnableConfirmNotificationsToChannel": true,
|
"EnableConfirmNotificationsToChannel": true,
|
||||||
"TeammateNameDisplay": "username",
|
"TeammateNameDisplay": "username",
|
||||||
"ExperimentalTownSquareIsReadOnly": false
|
"ExperimentalTownSquareIsReadOnly": false,
|
||||||
|
"DefaultTeamName": ""
|
||||||
},
|
},
|
||||||
"ClientRequirements": {
|
"ClientRequirements": {
|
||||||
"AndroidLatestVersion": "",
|
"AndroidLatestVersion": "",
|
||||||
|
|||||||
@@ -925,6 +925,7 @@ type TeamSettings struct {
|
|||||||
EnableConfirmNotificationsToChannel *bool
|
EnableConfirmNotificationsToChannel *bool
|
||||||
TeammateNameDisplay *string
|
TeammateNameDisplay *string
|
||||||
ExperimentalTownSquareIsReadOnly *bool
|
ExperimentalTownSquareIsReadOnly *bool
|
||||||
|
DefaultTeamName *string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *TeamSettings) SetDefaults() {
|
func (s *TeamSettings) SetDefaults() {
|
||||||
|
|||||||
@@ -463,6 +463,7 @@ func getClientConfig(c *model.Config) map[string]string {
|
|||||||
props["RestrictPrivateChannelManageMembers"] = *c.TeamSettings.RestrictPrivateChannelManageMembers
|
props["RestrictPrivateChannelManageMembers"] = *c.TeamSettings.RestrictPrivateChannelManageMembers
|
||||||
props["EnableXToLeaveChannelsFromLHS"] = strconv.FormatBool(*c.TeamSettings.EnableXToLeaveChannelsFromLHS)
|
props["EnableXToLeaveChannelsFromLHS"] = strconv.FormatBool(*c.TeamSettings.EnableXToLeaveChannelsFromLHS)
|
||||||
props["TeammateNameDisplay"] = *c.TeamSettings.TeammateNameDisplay
|
props["TeammateNameDisplay"] = *c.TeamSettings.TeammateNameDisplay
|
||||||
|
props["DefaultTeamName"] = *c.TeamSettings.DefaultTeamName
|
||||||
|
|
||||||
props["AndroidLatestVersion"] = c.ClientRequirements.AndroidLatestVersion
|
props["AndroidLatestVersion"] = c.ClientRequirements.AndroidLatestVersion
|
||||||
props["AndroidMinVersion"] = c.ClientRequirements.AndroidMinVersion
|
props["AndroidMinVersion"] = c.ClientRequirements.AndroidMinVersion
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user