summaryrefslogtreecommitdiffstats
path: root/model
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2017-10-25 08:52:50 -0400
committerGitHub <noreply@github.com>2017-10-25 08:52:50 -0400
commit1d968eb55eae7f0f6db087c9e8466b11800b888a (patch)
tree5561d7cda13278d217d7b5b19c2ec991819a0f97 /model
parent5474cff0ebab8c42f1b0750ac054a8c762b43a37 (diff)
downloadchat-1d968eb55eae7f0f6db087c9e8466b11800b888a.tar.gz
chat-1d968eb55eae7f0f6db087c9e8466b11800b888a.tar.bz2
chat-1d968eb55eae7f0f6db087c9e8466b11800b888a.zip
PLT-7849 Add config setting to disable plugin uploads (#7666)
* Add config setting to disable plugin uploads * Update unit test
Diffstat (limited to 'model')
-rw-r--r--model/config.go11
1 files changed, 8 insertions, 3 deletions
diff --git a/model/config.go b/model/config.go
index 4eee71737..493a432bb 100644
--- a/model/config.go
+++ b/model/config.go
@@ -511,9 +511,10 @@ type PluginState struct {
}
type PluginSettings struct {
- Enable *bool
- Plugins map[string]interface{}
- PluginStates map[string]*PluginState
+ Enable *bool
+ EnableUploads *bool
+ Plugins map[string]interface{}
+ PluginStates map[string]*PluginState
}
type Config struct {
@@ -1459,6 +1460,10 @@ func (o *Config) SetDefaults() {
}
if o.PluginSettings.Enable == nil {
+ o.PluginSettings.Enable = NewBool(true)
+ }
+
+ if o.PluginSettings.EnableUploads == nil {
o.PluginSettings.Enable = NewBool(false)
}