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

Add autoclose dm config parameter (#7734)

Browse Source 
* add autoclose dm config parameter

* update naming
This commit is contained in:
Chris
2017-10-30 12:52:47 -05:00
committed by enahum
parent 443a880fbd
commit 539f66313d
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
model/config.go
View File

@@ -204,6 +204,7 @@ type ServiceSettings struct {
EnableChannelViewedMessages *bool EnableChannelViewedMessages *bool
EnableUserStatuses *bool EnableUserStatuses *bool
ClusterLogTimeoutMilliseconds *int ClusterLogTimeoutMilliseconds *int
CloseUnusedDirectMessages *bool
} }
type ClusterSettings struct { type ClusterSettings struct {
@@ -1376,6 +1377,10 @@ func (o *Config) SetDefaults() {
o.ServiceSettings.ClusterLogTimeoutMilliseconds = NewInt(2000) o.ServiceSettings.ClusterLogTimeoutMilliseconds = NewInt(2000)
} }
if o.ServiceSettings.CloseUnusedDirectMessages == nil {
o.ServiceSettings.CloseUnusedDirectMessages = NewBool(false)
}
if o.ElasticsearchSettings.ConnectionUrl == nil { if o.ElasticsearchSettings.ConnectionUrl == nil {
o.ElasticsearchSettings.ConnectionUrl = NewString(ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL) o.ElasticsearchSettings.ConnectionUrl = NewString(ELASTICSEARCH_SETTINGS_DEFAULT_CONNECTION_URL)
} }

1
utils/config.go
View File

@@ -458,6 +458,7 @@ func getClientConfig(c *model.Config) map[string]string {
props["RestrictPostDelete"] = *c.ServiceSettings.RestrictPostDelete props["RestrictPostDelete"] = *c.ServiceSettings.RestrictPostDelete
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["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)