IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Hide pre-release features section of advanced settings pane. (#7847)

Browse Source
This commit is contained in:
Chris Duarte
2017-11-21 07:45:41 -08:00
committed by Joram Wilander
parent fdba2d50fd
commit cfa09ce0ef
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/default.json
View File

@@ -51,7 +51,8 @@
"EnableUserTypingMessages": true, "EnableUserTypingMessages": true,
"EnableChannelViewedMessages": true, "EnableChannelViewedMessages": true,
"EnableUserStatuses": true, "EnableUserStatuses": true,
"ClusterLogTimeoutMilliseconds": 2000 "ClusterLogTimeoutMilliseconds": 2000,
"EnablePreviewFeatures": true
}, },
"TeamSettings": { "TeamSettings": {
"SiteName": "Mattermost", "SiteName": "Mattermost",

1
model/config.go
View File

@@ -205,6 +205,7 @@ type ServiceSettings struct {
EnableUserStatuses *bool EnableUserStatuses *bool
ClusterLogTimeoutMilliseconds *int ClusterLogTimeoutMilliseconds *int
CloseUnusedDirectMessages *bool CloseUnusedDirectMessages *bool
EnablePreviewFeatures *bool
} }
func (s *ServiceSettings) SetDefaults() { func (s *ServiceSettings) SetDefaults() {

1
utils/config.go
View File

@@ -489,6 +489,7 @@ func getClientConfig(c *model.Config) map[string]string {
props["AllowEditPost"] = *c.ServiceSettings.AllowEditPost props["AllowEditPost"] = *c.ServiceSettings.AllowEditPost
props["PostEditTimeLimit"] = fmt.Sprintf("%v", *c.ServiceSettings.PostEditTimeLimit) props["PostEditTimeLimit"] = fmt.Sprintf("%v", *c.ServiceSettings.PostEditTimeLimit)
props["CloseUnusedDirectMessages"] = strconv.FormatBool(*c.ServiceSettings.CloseUnusedDirectMessages) props["CloseUnusedDirectMessages"] = strconv.FormatBool(*c.ServiceSettings.CloseUnusedDirectMessages)
props["EnablePreviewFeatures"] = strconv.FormatBool(*c.ServiceSettings.EnablePreviewFeatures)
props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications) props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications)
props["SendPushNotifications"] = strconv.FormatBool(*c.EmailSettings.SendPushNotifications) props["SendPushNotifications"] = strconv.FormatBool(*c.EmailSettings.SendPushNotifications)