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

PLT-7508: Add settings to disable wide mention confirmation (#7416)

Browse Source
This commit is contained in:
Jesús Espino
2017-09-20 17:38:27 +02:00
committed by Harrison Healey
parent 3a80225d61
commit 62e5e2fda8
4 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/diagnostics.go
View File

@@ -236,6 +236,7 @@ func trackConfig() {
"enable_custom_brand": *utils.Cfg.TeamSettings.EnableCustomBrand,
"restrict_direct_message": *utils.Cfg.TeamSettings.RestrictDirectMessage,
"max_notifications_per_channel": *utils.Cfg.TeamSettings.MaxNotificationsPerChannel,
"enable_confirm_notifications_to_channel": *utils.Cfg.TeamSettings.EnableConfirmNotificationsToChannel,
"max_users_per_team": *utils.Cfg.TeamSettings.MaxUsersPerTeam,
"max_channels_per_team": *utils.Cfg.TeamSettings.MaxChannelsPerTeam,
"teammate_name_display": *utils.Cfg.TeamSettings.TeammateNameDisplay,

1
config/default.json
View File

@@ -75,6 +75,7 @@
"UserStatusAwayTimeout": 300,
"MaxChannelsPerTeam": 2000,
"MaxNotificationsPerChannel": 1000,
"EnableConfirmNotificationsToChannel": true,
"TeammateNameDisplay": "username",
"ExperimentalTownSquareIsReadOnly": false
},

6
model/config.go
View File

@@ -368,6 +368,7 @@ type TeamSettings struct {
UserStatusAwayTimeout *int64
MaxChannelsPerTeam *int64
MaxNotificationsPerChannel *int64
EnableConfirmNotificationsToChannel *bool
TeammateNameDisplay *string
ExperimentalTownSquareIsReadOnly *bool
}
@@ -855,6 +856,11 @@ func (o *Config) SetDefaults() {
*o.TeamSettings.MaxNotificationsPerChannel = 1000
}
if o.TeamSettings.EnableConfirmNotificationsToChannel == nil {
o.TeamSettings.EnableConfirmNotificationsToChannel = new(bool)
*o.TeamSettings.EnableConfirmNotificationsToChannel = true
}
if o.TeamSettings.ExperimentalTownSquareIsReadOnly == nil {
o.TeamSettings.ExperimentalTownSquareIsReadOnly = new(bool)
*o.TeamSettings.ExperimentalTownSquareIsReadOnly = false

1
utils/config.go
View File

@@ -509,6 +509,7 @@ func getClientConfig(c *model.Config) map[string]string {
props["EnableWebrtc"] = strconv.FormatBool(*c.WebrtcSettings.Enable)
props["MaxNotificationsPerChannel"] = strconv.FormatInt(*c.TeamSettings.MaxNotificationsPerChannel, 10)
props["EnableConfirmNotificationsToChannel"] = strconv.FormatBool(*c.TeamSettings.EnableConfirmNotificationsToChannel)
props["TimeBetweenUserTypingUpdatesMilliseconds"] = strconv.FormatInt(*c.ServiceSettings.TimeBetweenUserTypingUpdatesMilliseconds, 10)
props["EnableUserTypingMessages"] = strconv.FormatBool(*c.ServiceSettings.EnableUserTypingMessages)
props["EnableChannelViewedMessages"] = strconv.FormatBool(*c.ServiceSettings.EnableChannelViewedMessages)