diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2018-05-23 02:10:27 +0800 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2018-05-22 11:10:27 -0700 |
| commit | ce378adc97399dcae9e1c9621c584669b813b2d2 (patch) | |
| tree | 4f1291aa95ead6bd324f8222d00a071a7efdbafb | |
| parent | 8fb070fecfbb91f22c6f540ecf0b77fb8be42ab2 (diff) | |
| download | chat-ce378adc97399dcae9e1c9621c584669b813b2d2.tar.gz chat-ce378adc97399dcae9e1c9621c584669b813b2d2.tar.bz2 chat-ce378adc97399dcae9e1c9621c584669b813b2d2.zip | |
add EnablePreviewModeBanner in config (#8834)
Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
| -rw-r--r-- | app/diagnostics.go | 1 | ||||
| -rw-r--r-- | config/default.json | 1 | ||||
| -rw-r--r-- | model/config.go | 5 | ||||
| -rw-r--r-- | utils/config.go | 1 |
4 files changed, 8 insertions, 0 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index 6855731ce..527ca9840 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -338,6 +338,7 @@ func (a *App) trackConfig() { "enable_email_batching": *cfg.EmailSettings.EnableEmailBatching, "email_batching_buffer_size": *cfg.EmailSettings.EmailBatchingBufferSize, "email_batching_interval": *cfg.EmailSettings.EmailBatchingInterval, + "enable_preview_mode_banner": *cfg.EmailSettings.EnablePreviewModeBanner, "isdefault_feedback_name": isDefault(cfg.EmailSettings.FeedbackName, ""), "isdefault_feedback_email": isDefault(cfg.EmailSettings.FeedbackEmail, ""), "isdefault_feedback_organization": isDefault(*cfg.EmailSettings.FeedbackOrganization, model.EMAIL_SETTINGS_DEFAULT_FEEDBACK_ORGANIZATION), diff --git a/config/default.json b/config/default.json index 97b2696aa..c80ff48de 100644 --- a/config/default.json +++ b/config/default.json @@ -177,6 +177,7 @@ "EnableEmailBatching": false, "EmailBatchingBufferSize": 256, "EmailBatchingInterval": 30, + "EnablePreviewModeBanner": true, "SkipServerCertificateVerification": false, "EmailNotificationContentsType": "full", "LoginButtonColor": "", diff --git a/model/config.go b/model/config.go index 4710658ec..7a2125061 100644 --- a/model/config.go +++ b/model/config.go @@ -739,6 +739,7 @@ type EmailSettings struct { EnableEmailBatching *bool EmailBatchingBufferSize *int EmailBatchingInterval *int + EnablePreviewModeBanner *bool SkipServerCertificateVerification *bool EmailNotificationContentsType *string LoginButtonColor *string @@ -791,6 +792,10 @@ func (s *EmailSettings) SetDefaults() { s.EmailBatchingInterval = NewInt(EMAIL_BATCHING_INTERVAL) } + if s.EnablePreviewModeBanner == nil { + s.EnablePreviewModeBanner = NewBool(true) + } + if s.EnableSMTPAuth == nil { s.EnableSMTPAuth = new(bool) if s.ConnectionSecurity == CONN_SECURITY_NONE { diff --git a/utils/config.go b/utils/config.go index c3f58cc79..dd782c0fc 100644 --- a/utils/config.go +++ b/utils/config.go @@ -501,6 +501,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L props["EnableSignInWithUsername"] = strconv.FormatBool(*c.EmailSettings.EnableSignInWithUsername) props["RequireEmailVerification"] = strconv.FormatBool(c.EmailSettings.RequireEmailVerification) props["EnableEmailBatching"] = strconv.FormatBool(*c.EmailSettings.EnableEmailBatching) + props["EnablePreviewModeBanner"] = strconv.FormatBool(*c.EmailSettings.EnablePreviewModeBanner) props["EmailNotificationContentsType"] = *c.EmailSettings.EmailNotificationContentsType props["EmailLoginButtonColor"] = *c.EmailSettings.LoginButtonColor |