From ce2b2be5de578bd9eb44b26e04db75ca61d67ca5 Mon Sep 17 00:00:00 2001 From: Chris Date: Tue, 31 Oct 2017 09:39:31 -0500 Subject: Refactoring cfg refs and load / save functions (#7749) * refactoring cfg refs and load / save functions * improve error output --- app/plugins.go | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'app/plugins.go') diff --git a/app/plugins.go b/app/plugins.go index c2f3c4785..c2e15b385 100644 --- a/app/plugins.go +++ b/app/plugins.go @@ -471,10 +471,11 @@ func (a *App) EnablePlugin(id string) *model.AppError { return model.NewAppError("EnablePlugin", "app.plugin.not_installed.app_error", nil, "", http.StatusBadRequest) } - cfg := a.Config() - cfg.PluginSettings.PluginStates[id] = &model.PluginState{Enable: true} + a.UpdateConfig(func(cfg *model.Config) { + cfg.PluginSettings.PluginStates[id] = &model.PluginState{Enable: true} + }) - if err := a.SaveConfig(cfg, true); err != nil { + if err := a.SaveConfig(a.Config(), true); err != nil { return model.NewAppError("EnablePlugin", "app.plugin.config.app_error", nil, err.Error(), http.StatusInternalServerError) } @@ -504,10 +505,11 @@ func (a *App) DisablePlugin(id string) *model.AppError { return model.NewAppError("DisablePlugin", "app.plugin.not_installed.app_error", nil, "", http.StatusBadRequest) } - cfg := a.Config() - cfg.PluginSettings.PluginStates[id] = &model.PluginState{Enable: false} + a.UpdateConfig(func(cfg *model.Config) { + cfg.PluginSettings.PluginStates[id] = &model.PluginState{Enable: false} + }) - if err := a.SaveConfig(cfg, true); err != nil { + if err := a.SaveConfig(a.Config(), true); err != nil { return model.NewAppError("DisablePlugin", "app.plugin.config.app_error", nil, err.Error(), http.StatusInternalServerError) } -- cgit v1.2.3-1-g7c22