diff options
author | Chris Duarte <csduarte@users.noreply.github.com> | 2018-03-22 06:53:43 -0700 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2018-03-22 09:53:43 -0400 |
commit | 74e703f58daff2aded07a969410f988cff9ada9b (patch) | |
tree | 354150b3a53f00edea40d6488c4a6f0bacfde107 /model/config.go | |
parent | 9d701c704416a1d8648dd2818a8a15c4da99b424 (diff) | |
download | chat-74e703f58daff2aded07a969410f988cff9ada9b.tar.gz chat-74e703f58daff2aded07a969410f988cff9ada9b.tar.bz2 chat-74e703f58daff2aded07a969410f988cff9ada9b.zip |
Timezone feature (#8185)
* Add supported timezones into config
Remove Timezone list creation in favor of timezone from configs
Add Timezone field to Users table
Clean up format of SupportedTimezones in config
* Remove unwanted change
* Add test for updating user timezone
* Add empty map[string]string if Timezone is null
* Add EnableTimezoneSelection config
* Revert back to map[string]string for ClientConfig
* Refactor SupportedTimezones into timezones.json
* Include timezones.json in TestConfigFlag
* Add timezone api endpoint
* Bump varchar size to 256 and setMaxSize in user_store
* Refactor LoadConfig to LoadConfig and LoadTimezoneConfig
* Remove unnecessary argument in LoadConfig, mail_test
* Add test for timezone endpoint
* Add license header
* Refactor timezones endpoint to system.go
* Add system base route to timezone endpoint
* db timezone upgrade in db v4.9
* Avoid saving SupportedTimezones to config.json
* Add timezonePath support in config
* Remove EnableTimezoneSelection from config
* Use return statement without return parameter
* Refactor test for SupportedTimezones
* Check for supportedTimezone != nil instead of using len
* Decouple SupportedTimezones out of Config
* Fix failing test
* Add LastTeamIconUpdate back in upgrade.go
* Write timezone config in config_flag_test
* Add code fallback for default timezone support
Diffstat (limited to 'model/config.go')
-rw-r--r-- | model/config.go | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index cf26c4205..4e13ca16e 100644 --- a/model/config.go +++ b/model/config.go @@ -1700,6 +1700,16 @@ func (s *MessageExportSettings) SetDefaults() { } } +type TimezoneSettings struct { + SupportedTimezonesPath *string +} + +func (s *TimezoneSettings) SetDefaults() { + if s.SupportedTimezonesPath == nil { + s.SupportedTimezonesPath = NewString("timezones.json") + } +} + type ConfigFunc func() *Config type Config struct { @@ -1733,6 +1743,7 @@ type Config struct { MessageExportSettings MessageExportSettings JobSettings JobSettings PluginSettings PluginSettings + TimezoneSettings TimezoneSettings } func (o *Config) Clone() *Config { @@ -1802,6 +1813,7 @@ func (o *Config) SetDefaults() { o.JobSettings.SetDefaults() o.WebrtcSettings.SetDefaults() o.MessageExportSettings.SetDefaults() + o.TimezoneSettings.SetDefaults() } func (o *Config) IsValid() *AppError { |