MM-26620 Add a config setting for controlling ask community link (#14985)

* MM-26620 Add a config setting for controlling ask community link

* Update setting

* Change to support setting
Этот коммит содержится в:
Sudheer
2020-07-09 17:59:22 +05:30
коммит произвёл GitHub
родитель 8b6a5fc5d7
Коммит 50fd95717e
3 изменённых файлов: 7 добавлений и 0 удалений

Просмотреть файл

@@ -512,6 +512,7 @@ func (s *Server) trackConfig() {
"isdefault_support_email": isDefault(*cfg.SupportSettings.SupportEmail, model.SUPPORT_SETTINGS_DEFAULT_SUPPORT_EMAIL), "isdefault_support_email": isDefault(*cfg.SupportSettings.SupportEmail, model.SUPPORT_SETTINGS_DEFAULT_SUPPORT_EMAIL),
"custom_terms_of_service_enabled": *cfg.SupportSettings.CustomTermsOfServiceEnabled, "custom_terms_of_service_enabled": *cfg.SupportSettings.CustomTermsOfServiceEnabled,
"custom_terms_of_service_re_acceptance_period": *cfg.SupportSettings.CustomTermsOfServiceReAcceptancePeriod, "custom_terms_of_service_re_acceptance_period": *cfg.SupportSettings.CustomTermsOfServiceReAcceptancePeriod,
"enable_ask_community_link": *cfg.SupportSettings.EnableAskCommunityLink,
}) })
s.SendDiagnostic(TRACK_CONFIG_LDAP, map[string]interface{}{ s.SendDiagnostic(TRACK_CONFIG_LDAP, map[string]interface{}{

Просмотреть файл

@@ -239,6 +239,7 @@ func GenerateLimitedClientConfig(c *model.Config, diagnosticID string, license *
props["HelpLink"] = *c.SupportSettings.HelpLink props["HelpLink"] = *c.SupportSettings.HelpLink
props["ReportAProblemLink"] = *c.SupportSettings.ReportAProblemLink props["ReportAProblemLink"] = *c.SupportSettings.ReportAProblemLink
props["SupportEmail"] = *c.SupportSettings.SupportEmail props["SupportEmail"] = *c.SupportSettings.SupportEmail
props["EnableAskCommunityLink"] = strconv.FormatBool(*c.SupportSettings.EnableAskCommunityLink)
props["DefaultClientLocale"] = *c.LocalizationSettings.DefaultClientLocale props["DefaultClientLocale"] = *c.LocalizationSettings.DefaultClientLocale

Просмотреть файл

@@ -1596,6 +1596,7 @@ type SupportSettings struct {
SupportEmail *string SupportEmail *string
CustomTermsOfServiceEnabled *bool CustomTermsOfServiceEnabled *bool
CustomTermsOfServiceReAcceptancePeriod *int CustomTermsOfServiceReAcceptancePeriod *int
EnableAskCommunityLink *bool
} }
func (s *SupportSettings) SetDefaults() { func (s *SupportSettings) SetDefaults() {
@@ -1650,6 +1651,10 @@ func (s *SupportSettings) SetDefaults() {
if s.CustomTermsOfServiceReAcceptancePeriod == nil { if s.CustomTermsOfServiceReAcceptancePeriod == nil {
s.CustomTermsOfServiceReAcceptancePeriod = NewInt(SUPPORT_SETTINGS_DEFAULT_RE_ACCEPTANCE_PERIOD) s.CustomTermsOfServiceReAcceptancePeriod = NewInt(SUPPORT_SETTINGS_DEFAULT_RE_ACCEPTANCE_PERIOD)
} }
if s.EnableAskCommunityLink == nil {
s.EnableAskCommunityLink = NewBool(true)
}
} }
type AnnouncementSettings struct { type AnnouncementSettings struct {