diff options
| author | Harshil Sharma <harshil.sharma@joshtechnologygroup.com> | 2018-09-26 20:49:22 +0000 |
|---|---|---|
| committer | Jesse Hallam <jesse.hallam@gmail.com> | 2018-09-26 16:49:22 -0400 |
| commit | af275fe9242303581192258ef4f6457fa45a58e4 (patch) | |
| tree | df05afdb0894d577574cbee5d056ffddeec3a93e /model/config.go | |
| parent | 4e59a27293394b6d5529efd13ad711daebbc0eb3 (diff) | |
| download | chat-af275fe9242303581192258ef4f6457fa45a58e4.tar.gz chat-af275fe9242303581192258ef4f6457fa45a58e4.tar.bz2 chat-af275fe9242303581192258ef4f6457fa45a58e4.zip | |
#MM-12130 changes for custom service terms (#9450)
* #MM-12130 changes for custom service terms
* Fixed styling
* Added getServiceTerms API
* removed unnecessary panic
* removed custom service terms text from flat config
* reverted user sql store as those changes are no longer needed
* added tests
* Updated a config key to be more standard
* Added copyright info
* Loading service terms only if the feature is enabled
* Loading service terms only if the feature is enabled
* removed unused index
* added createservice termns API
* made a param to bool instead of string
* added createservice termns API
* review fixes
* fixed styling
* Minor refactoring
* removed saveConfig and loadConfig magic
* added empty service terms text check to createServiceTerms API
* refactoed some urls to be terms_of_service instead of service_terms
* removed check for support settings
* changed URLs in tests
* removed unused code
* fixed a bug
* added service termd id in conif
* fixed a test
* review fixes
* minor fixes
* Fixed TestCreateServiceTerms
Diffstat (limited to 'model/config.go')
| -rw-r--r-- | model/config.go | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/model/config.go b/model/config.go index db3030170..5e6a676ae 100644 --- a/model/config.go +++ b/model/config.go @@ -996,12 +996,13 @@ type PrivacySettings struct { } type SupportSettings struct { - TermsOfServiceLink *string - PrivacyPolicyLink *string - AboutLink *string - HelpLink *string - ReportAProblemLink *string - SupportEmail *string + TermsOfServiceLink *string + PrivacyPolicyLink *string + AboutLink *string + HelpLink *string + ReportAProblemLink *string + SupportEmail *string + CustomServiceTermsEnabled *bool } func (s *SupportSettings) SetDefaults() { @@ -1048,6 +1049,10 @@ func (s *SupportSettings) SetDefaults() { if s.SupportEmail == nil { s.SupportEmail = NewString(SUPPORT_SETTINGS_DEFAULT_SUPPORT_EMAIL) } + + if s.CustomServiceTermsEnabled == nil { + s.CustomServiceTermsEnabled = NewBool(false) + } } type AnnouncementSettings struct { |