Этот коммит содержится в:
Chris Duarte
2018-03-29 07:04:17 -07:00
коммит произвёл Harrison Healey
родитель d4c0494360
Коммит eb48292a3a
3 изменённых файлов: 16 добавлений и 0 удалений

Просмотреть файл

@@ -92,6 +92,9 @@
"ExperimentalTownSquareIsReadOnly": false, "ExperimentalTownSquareIsReadOnly": false,
"ExperimentalPrimaryTeam": "" "ExperimentalPrimaryTeam": ""
}, },
"DisplaySettings": {
"ExperimentalTimezone": false
},
"ClientRequirements": { "ClientRequirements": {
"AndroidLatestVersion": "", "AndroidLatestVersion": "",
"AndroidMinVersion": "", "AndroidMinVersion": "",

Просмотреть файл

@@ -1712,6 +1712,16 @@ func (s *MessageExportSettings) SetDefaults() {
} }
} }
type DisplaySettings struct {
ExperimentalTimezone *bool
}
func (s *DisplaySettings) SetDefaults() {
if s.ExperimentalTimezone == nil {
s.ExperimentalTimezone = NewBool(false)
}
}
type TimezoneSettings struct { type TimezoneSettings struct {
SupportedTimezonesPath *string SupportedTimezonesPath *string
} }
@@ -1755,6 +1765,7 @@ type Config struct {
MessageExportSettings MessageExportSettings MessageExportSettings MessageExportSettings
JobSettings JobSettings JobSettings JobSettings
PluginSettings PluginSettings PluginSettings PluginSettings
DisplaySettings DisplaySettings
TimezoneSettings TimezoneSettings TimezoneSettings TimezoneSettings
} }
@@ -1826,6 +1837,7 @@ func (o *Config) SetDefaults() {
o.WebrtcSettings.SetDefaults() o.WebrtcSettings.SetDefaults()
o.MessageExportSettings.SetDefaults() o.MessageExportSettings.SetDefaults()
o.TimezoneSettings.SetDefaults() o.TimezoneSettings.SetDefaults()
o.DisplaySettings.SetDefaults()
} }
func (o *Config) IsValid() *AppError { func (o *Config) IsValid() *AppError {

Просмотреть файл

@@ -382,6 +382,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
props["EnableTutorial"] = strconv.FormatBool(*c.ServiceSettings.EnableTutorial) props["EnableTutorial"] = strconv.FormatBool(*c.ServiceSettings.EnableTutorial)
props["ExperimentalEnableDefaultChannelLeaveJoinMessages"] = strconv.FormatBool(*c.ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages) props["ExperimentalEnableDefaultChannelLeaveJoinMessages"] = strconv.FormatBool(*c.ServiceSettings.ExperimentalEnableDefaultChannelLeaveJoinMessages)
props["ExperimentalGroupUnreadChannels"] = *c.ServiceSettings.ExperimentalGroupUnreadChannels props["ExperimentalGroupUnreadChannels"] = *c.ServiceSettings.ExperimentalGroupUnreadChannels
props["ExperimentalTimezone"] = strconv.FormatBool(*c.DisplaySettings.ExperimentalTimezone)
props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications) props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications)
props["SendPushNotifications"] = strconv.FormatBool(*c.EmailSettings.SendPushNotifications) props["SendPushNotifications"] = strconv.FormatBool(*c.EmailSettings.SendPushNotifications)