summaryrefslogtreecommitdiffstats
path: root/model/config.go
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2018-04-04 08:14:23 -0400
committerJoram Wilander <jwawilander@gmail.com>2018-04-04 08:14:23 -0400
commit7986eeea263703256fe81b93035472722b15e4ff (patch)
tree42ceb765e2eb31295e0062437c31970055d2c406 /model/config.go
parent80925f7cfd2fe4fe98418119c70e5e36c738f41a (diff)
downloadchat-7986eeea263703256fe81b93035472722b15e4ff.tar.gz
chat-7986eeea263703256fe81b93035472722b15e4ff.tar.bz2
chat-7986eeea263703256fe81b93035472722b15e4ff.zip
Add missing timezone setting to app/diagnostics.go (#8572)
* Add missing timezone setting to app/diagnostics.go * Update diagnostics.go * Added TimezoneSettings.SupportedTimezonesPath to diagnostics
Diffstat (limited to 'model/config.go')
-rw-r--r--model/config.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/model/config.go b/model/config.go
index c2b514c33..6c6cf90e9 100644
--- a/model/config.go
+++ b/model/config.go
@@ -152,6 +152,8 @@ const (
PLUGIN_SETTINGS_DEFAULT_DIRECTORY = "./plugins"
PLUGIN_SETTINGS_DEFAULT_CLIENT_DIRECTORY = "./client/plugins"
+ TIMEZONE_SETTINGS_DEFAULT_SUPPORTED_TIMEZONES_PATH = "timezones.json"
+
COMPLIANCE_EXPORT_TYPE_ACTIANCE = "actiance"
COMPLIANCE_EXPORT_TYPE_GLOBALRELAY = "globalrelay"
GLOBALRELAY_CUSTOMER_TYPE_A9 = "A9"
@@ -1728,7 +1730,7 @@ type TimezoneSettings struct {
func (s *TimezoneSettings) SetDefaults() {
if s.SupportedTimezonesPath == nil {
- s.SupportedTimezonesPath = NewString("timezones.json")
+ s.SupportedTimezonesPath = NewString(TIMEZONE_SETTINGS_DEFAULT_SUPPORTED_TIMEZONES_PATH)
}
}