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 /store | |
| 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 'store')
| -rw-r--r-- | store/sqlstore/upgrade.go | 7 | ||||
| -rw-r--r-- | store/sqlstore/user_store.go | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/store/sqlstore/upgrade.go b/store/sqlstore/upgrade.go index 58de85c7f..d528e464d 100644 --- a/store/sqlstore/upgrade.go +++ b/store/sqlstore/upgrade.go @@ -4,6 +4,7 @@ package sqlstore import ( + "encoding/json" "os" "strings" "time" @@ -376,6 +377,12 @@ func UpgradeDatabaseToVersion49(sqlStore SqlStore) { //TODO: Uncomment the following condition when version 4.9.0 is released //if shouldPerformUpgrade(sqlStore, VERSION_4_8_0, VERSION_4_9_0) { sqlStore.CreateColumnIfNotExists("Teams", "LastTeamIconUpdate", "bigint", "bigint", "0") + defaultTimezone := model.DefaultUserTimezone() + defaultTimezoneValue, err := json.Marshal(defaultTimezone) + if err != nil { + l4g.Critical(err) + } + sqlStore.CreateColumnIfNotExists("Users", "Timezone", "varchar(256)", "varchar(256)", string(defaultTimezoneValue)) // saveSchemaVersion(sqlStore, VERSION_4_9_0) //} } diff --git a/store/sqlstore/user_store.go b/store/sqlstore/user_store.go index 5e84af930..f4ed3e400 100644 --- a/store/sqlstore/user_store.go +++ b/store/sqlstore/user_store.go @@ -79,6 +79,7 @@ func NewSqlUserStore(sqlStore SqlStore, metrics einterfaces.MetricsInterface) st table.ColMap("Locale").SetMaxSize(5) table.ColMap("MfaSecret").SetMaxSize(128) table.ColMap("Position").SetMaxSize(128) + table.ColMap("Timezone").SetMaxSize(256) } return us |