diff options
| author | Saturnino Abril <saturnino.abril@gmail.com> | 2017-07-06 08:48:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-06 08:48:34 +0800 |
| commit | 279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c (patch) | |
| tree | e94482d436da3bc8eb0d4021edbf5631cb75322d /model | |
| parent | 918ce03622c3fb618a13c240e7c4d51edf5a818b (diff) | |
| download | chat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.tar.gz chat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.tar.bz2 chat-279c7b7fda9a8c1ce6685d61b110a7bdbf518a1c.zip | |
[PLT-6969] System console setting for the emoji picker (#6809)
* system console setting for the emoji picker
* remove state.emojiPickerEnable
* update url to /admin_console/customization/emoji
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/model/config.go b/model/config.go index 25b4d8632..5f644fad0 100644 --- a/model/config.go +++ b/model/config.go @@ -159,6 +159,7 @@ type ServiceSettings struct { WebsocketPort *int WebserverMode *string EnableCustomEmoji *bool + EnableEmojiPicker *bool RestrictCustomEmojiCreation *string RestrictPostDelete *string AllowEditPost *string @@ -1032,7 +1033,12 @@ func (o *Config) SetDefaults() { if o.ServiceSettings.EnableCustomEmoji == nil { o.ServiceSettings.EnableCustomEmoji = new(bool) - *o.ServiceSettings.EnableCustomEmoji = true + *o.ServiceSettings.EnableCustomEmoji = false + } + + if o.ServiceSettings.EnableEmojiPicker == nil { + o.ServiceSettings.EnableEmojiPicker = new(bool) + *o.ServiceSettings.EnableEmojiPicker = false } if o.ServiceSettings.RestrictCustomEmojiCreation == nil { |