From b316e1384ede5e157e19396b17a0edcdd5e32fa0 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Wed, 26 Oct 2022 18:15:19 -0400 Subject: [PATCH] Change status code to 400 when attempting to enable Boards plugin with product enabled (#21521) --- api4/config.go | 2 +- app/plugin.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api4/config.go b/api4/config.go index a1f4bb3243..0bcdfbb3f5 100644 --- a/api4/config.go +++ b/api4/config.go @@ -157,7 +157,7 @@ func updateConfig(c *Context, w http.ResponseWriter, r *http.Request) { } if cfg.PluginSettings.PluginStates[model.PluginIdFocalboard].Enable && cfg.FeatureFlags.BoardsProduct { - c.Err = model.NewAppError("EnablePlugin", "app.plugin.product_mode.app_error", map[string]any{"Name": model.PluginIdFocalboard}, "", http.StatusInternalServerError) + c.Err = model.NewAppError("EnablePlugin", "app.plugin.product_mode.app_error", map[string]any{"Name": model.PluginIdFocalboard}, "", http.StatusBadRequest) return } diff --git a/app/plugin.go b/app/plugin.go index b8c1898999..01dc070796 100644 --- a/app/plugin.go +++ b/app/plugin.go @@ -456,7 +456,7 @@ func (ch *Channels) enablePlugin(id string) *model.AppError { } if id == model.PluginIdFocalboard && ch.cfgSvc.Config().FeatureFlags.BoardsProduct { - return model.NewAppError("EnablePlugin", "app.plugin.product_mode.app_error", map[string]any{"Name": model.PluginIdFocalboard}, "", http.StatusInternalServerError) + return model.NewAppError("EnablePlugin", "app.plugin.product_mode.app_error", map[string]any{"Name": model.PluginIdFocalboard}, "", http.StatusBadRequest) } ch.cfgSvc.UpdateConfig(func(cfg *model.Config) {