diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-08-03 18:16:09 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-08-03 18:16:09 +0000 |
| commit | 4ae0a6652f2aaa04c8f96a7bfb4ffe35c8bfdeaf (patch) | |
| tree | 53f9822563351ae9af3e021261ae97a2832a9671 /lib/pleroma/web/admin_api/admin_api_controller.ex | |
| parent | 99ce6d6044606f8a91cb101c7f08a493a6644ee8 (diff) | |
| parent | de0f3b73dd7c76b6b19b38804f98f6e7ccba7222 (diff) | |
| download | pleroma-4ae0a6652f2aaa04c8f96a7bfb4ffe35c8bfdeaf.tar.gz | |
Merge branch 'admin-fixes' into 'develop'
Admin fixes
See merge request pleroma/pleroma!1524
Diffstat (limited to 'lib/pleroma/web/admin_api/admin_api_controller.ex')
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index fcda57b3e..2d3d0adc4 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -402,9 +402,9 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do if Pleroma.Config.get([:instance, :dynamic_configuration]) do updated = Enum.map(configs, fn - %{"group" => group, "key" => key, "delete" => "true"} -> - {:ok, _} = Config.delete(%{group: group, key: key}) - nil + %{"group" => group, "key" => key, "delete" => "true"} = params -> + {:ok, config} = Config.delete(%{group: group, key: key, subkeys: params["subkeys"]}) + config %{"group" => group, "key" => key, "value" => value} -> {:ok, config} = Config.update_or_create(%{group: group, key: key, value: value}) |