rename DefaultTeamName to ExperimentalPrimaryTeam (#8039)
Этот коммит содержится в:
коммит произвёл
Joram Wilander
родитель
45e372fb5b
Коммит
74eb82cfaa
@@ -83,7 +83,7 @@
|
|||||||
"EnableConfirmNotificationsToChannel": true,
|
"EnableConfirmNotificationsToChannel": true,
|
||||||
"TeammateNameDisplay": "username",
|
"TeammateNameDisplay": "username",
|
||||||
"ExperimentalTownSquareIsReadOnly": false,
|
"ExperimentalTownSquareIsReadOnly": false,
|
||||||
"DefaultTeamName": ""
|
"ExperimentalPrimaryTeam": ""
|
||||||
},
|
},
|
||||||
"ClientRequirements": {
|
"ClientRequirements": {
|
||||||
"AndroidLatestVersion": "",
|
"AndroidLatestVersion": "",
|
||||||
|
|||||||
@@ -940,7 +940,7 @@ type TeamSettings struct {
|
|||||||
EnableConfirmNotificationsToChannel *bool
|
EnableConfirmNotificationsToChannel *bool
|
||||||
TeammateNameDisplay *string
|
TeammateNameDisplay *string
|
||||||
ExperimentalTownSquareIsReadOnly *bool
|
ExperimentalTownSquareIsReadOnly *bool
|
||||||
DefaultTeamName *string
|
ExperimentalPrimaryTeam *string
|
||||||
}
|
}
|
||||||
|
|
||||||
func (s *TeamSettings) SetDefaults() {
|
func (s *TeamSettings) SetDefaults() {
|
||||||
@@ -1037,8 +1037,8 @@ func (s *TeamSettings) SetDefaults() {
|
|||||||
s.ExperimentalTownSquareIsReadOnly = NewBool(false)
|
s.ExperimentalTownSquareIsReadOnly = NewBool(false)
|
||||||
}
|
}
|
||||||
|
|
||||||
if s.DefaultTeamName == nil {
|
if s.ExperimentalPrimaryTeam == nil {
|
||||||
s.DefaultTeamName = NewString("")
|
s.ExperimentalPrimaryTeam = NewString("")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -463,7 +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["ExperimentalPrimaryTeam"] = *c.TeamSettings.ExperimentalPrimaryTeam
|
||||||
|
|
||||||
props["AndroidLatestVersion"] = c.ClientRequirements.AndroidLatestVersion
|
props["AndroidLatestVersion"] = c.ClientRequirements.AndroidLatestVersion
|
||||||
props["AndroidMinVersion"] = c.ClientRequirements.AndroidMinVersion
|
props["AndroidMinVersion"] = c.ClientRequirements.AndroidMinVersion
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user