diff options
| author | Chris <ccbrown112@gmail.com> | 2017-10-18 15:36:43 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-18 15:36:43 -0700 |
| commit | 8e19ba029f889519d93cf272960dce858971106c (patch) | |
| tree | d8f38ac62661fb8578e2b5c3c619fe31ab29f480 /api4/plugin.go | |
| parent | 34a87fa8f47b1447b73e3ae56866b654801b3eee (diff) | |
| download | chat-8e19ba029f889519d93cf272960dce858971106c.tar.gz chat-8e19ba029f889519d93cf272960dce858971106c.tar.bz2 chat-8e19ba029f889519d93cf272960dce858971106c.zip | |
Reduce utils.Cfg references (#7650)
* app.UpdateConfig method
* test fix
* another test fix
* the config override option as-was is just error prone, remove it for now
* derp
Diffstat (limited to 'api4/plugin.go')
| -rw-r--r-- | api4/plugin.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/api4/plugin.go b/api4/plugin.go index 08dea6301..2045a35a8 100644 --- a/api4/plugin.go +++ b/api4/plugin.go @@ -11,7 +11,6 @@ import ( l4g "github.com/alecthomas/log4go" "github.com/mattermost/mattermost-server/app" "github.com/mattermost/mattermost-server/model" - "github.com/mattermost/mattermost-server/utils" ) const ( @@ -30,7 +29,7 @@ func (api *API) InitPlugin() { } func uploadPlugin(c *Context, w http.ResponseWriter, r *http.Request) { - if !*utils.Cfg.PluginSettings.Enable { + if !*c.App.Config().PluginSettings.Enable { c.Err = model.NewAppError("uploadPlugin", "app.plugin.disabled.app_error", nil, "", http.StatusNotImplemented) return } @@ -77,7 +76,7 @@ func uploadPlugin(c *Context, w http.ResponseWriter, r *http.Request) { } func getPlugins(c *Context, w http.ResponseWriter, r *http.Request) { - if !*utils.Cfg.PluginSettings.Enable { + if !*c.App.Config().PluginSettings.Enable { c.Err = model.NewAppError("getPlugins", "app.plugin.disabled.app_error", nil, "", http.StatusNotImplemented) return } @@ -102,7 +101,7 @@ func removePlugin(c *Context, w http.ResponseWriter, r *http.Request) { return } - if !*utils.Cfg.PluginSettings.Enable { + if !*c.App.Config().PluginSettings.Enable { c.Err = model.NewAppError("getPlugins", "app.plugin.disabled.app_error", nil, "", http.StatusNotImplemented) return } @@ -122,7 +121,7 @@ func removePlugin(c *Context, w http.ResponseWriter, r *http.Request) { } func getWebappPlugins(c *Context, w http.ResponseWriter, r *http.Request) { - if !*utils.Cfg.PluginSettings.Enable { + if !*c.App.Config().PluginSettings.Enable { c.Err = model.NewAppError("getWebappPlugins", "app.plugin.disabled.app_error", nil, "", http.StatusNotImplemented) return } |