add EnablePreviewModeBanner in config (#8834)
Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
Этот коммит содержится в:
коммит произвёл
Christopher Speller
родитель
8fb070fecf
Коммит
ce378adc97
@@ -338,6 +338,7 @@ func (a *App) trackConfig() {
|
|||||||
"enable_email_batching": *cfg.EmailSettings.EnableEmailBatching,
|
"enable_email_batching": *cfg.EmailSettings.EnableEmailBatching,
|
||||||
"email_batching_buffer_size": *cfg.EmailSettings.EmailBatchingBufferSize,
|
"email_batching_buffer_size": *cfg.EmailSettings.EmailBatchingBufferSize,
|
||||||
"email_batching_interval": *cfg.EmailSettings.EmailBatchingInterval,
|
"email_batching_interval": *cfg.EmailSettings.EmailBatchingInterval,
|
||||||
|
"enable_preview_mode_banner": *cfg.EmailSettings.EnablePreviewModeBanner,
|
||||||
"isdefault_feedback_name": isDefault(cfg.EmailSettings.FeedbackName, ""),
|
"isdefault_feedback_name": isDefault(cfg.EmailSettings.FeedbackName, ""),
|
||||||
"isdefault_feedback_email": isDefault(cfg.EmailSettings.FeedbackEmail, ""),
|
"isdefault_feedback_email": isDefault(cfg.EmailSettings.FeedbackEmail, ""),
|
||||||
"isdefault_feedback_organization": isDefault(*cfg.EmailSettings.FeedbackOrganization, model.EMAIL_SETTINGS_DEFAULT_FEEDBACK_ORGANIZATION),
|
"isdefault_feedback_organization": isDefault(*cfg.EmailSettings.FeedbackOrganization, model.EMAIL_SETTINGS_DEFAULT_FEEDBACK_ORGANIZATION),
|
||||||
|
|||||||
@@ -177,6 +177,7 @@
|
|||||||
"EnableEmailBatching": false,
|
"EnableEmailBatching": false,
|
||||||
"EmailBatchingBufferSize": 256,
|
"EmailBatchingBufferSize": 256,
|
||||||
"EmailBatchingInterval": 30,
|
"EmailBatchingInterval": 30,
|
||||||
|
"EnablePreviewModeBanner": true,
|
||||||
"SkipServerCertificateVerification": false,
|
"SkipServerCertificateVerification": false,
|
||||||
"EmailNotificationContentsType": "full",
|
"EmailNotificationContentsType": "full",
|
||||||
"LoginButtonColor": "",
|
"LoginButtonColor": "",
|
||||||
|
|||||||
@@ -739,6 +739,7 @@ type EmailSettings struct {
|
|||||||
EnableEmailBatching *bool
|
EnableEmailBatching *bool
|
||||||
EmailBatchingBufferSize *int
|
EmailBatchingBufferSize *int
|
||||||
EmailBatchingInterval *int
|
EmailBatchingInterval *int
|
||||||
|
EnablePreviewModeBanner *bool
|
||||||
SkipServerCertificateVerification *bool
|
SkipServerCertificateVerification *bool
|
||||||
EmailNotificationContentsType *string
|
EmailNotificationContentsType *string
|
||||||
LoginButtonColor *string
|
LoginButtonColor *string
|
||||||
@@ -791,6 +792,10 @@ func (s *EmailSettings) SetDefaults() {
|
|||||||
s.EmailBatchingInterval = NewInt(EMAIL_BATCHING_INTERVAL)
|
s.EmailBatchingInterval = NewInt(EMAIL_BATCHING_INTERVAL)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if s.EnablePreviewModeBanner == nil {
|
||||||
|
s.EnablePreviewModeBanner = NewBool(true)
|
||||||
|
}
|
||||||
|
|
||||||
if s.EnableSMTPAuth == nil {
|
if s.EnableSMTPAuth == nil {
|
||||||
s.EnableSMTPAuth = new(bool)
|
s.EnableSMTPAuth = new(bool)
|
||||||
if s.ConnectionSecurity == CONN_SECURITY_NONE {
|
if s.ConnectionSecurity == CONN_SECURITY_NONE {
|
||||||
|
|||||||
@@ -501,6 +501,7 @@ func GenerateClientConfig(c *model.Config, diagnosticId string, license *model.L
|
|||||||
props["EnableSignInWithUsername"] = strconv.FormatBool(*c.EmailSettings.EnableSignInWithUsername)
|
props["EnableSignInWithUsername"] = strconv.FormatBool(*c.EmailSettings.EnableSignInWithUsername)
|
||||||
props["RequireEmailVerification"] = strconv.FormatBool(c.EmailSettings.RequireEmailVerification)
|
props["RequireEmailVerification"] = strconv.FormatBool(c.EmailSettings.RequireEmailVerification)
|
||||||
props["EnableEmailBatching"] = strconv.FormatBool(*c.EmailSettings.EnableEmailBatching)
|
props["EnableEmailBatching"] = strconv.FormatBool(*c.EmailSettings.EnableEmailBatching)
|
||||||
|
props["EnablePreviewModeBanner"] = strconv.FormatBool(*c.EmailSettings.EnablePreviewModeBanner)
|
||||||
props["EmailNotificationContentsType"] = *c.EmailSettings.EmailNotificationContentsType
|
props["EmailNotificationContentsType"] = *c.EmailSettings.EmailNotificationContentsType
|
||||||
|
|
||||||
props["EmailLoginButtonColor"] = *c.EmailSettings.LoginButtonColor
|
props["EmailLoginButtonColor"] = *c.EmailSettings.LoginButtonColor
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user