X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Fadmin_api%2Fviews%2Fconfig_view.ex;h=d2d8b59070c0e942ee48ed8700b3abeb5bbbe447;hb=9c672ecbb5d4477cd16d2139a2cb66d3923ac5c8;hp=49add0b6e286a98e434daf8f617bc1f237a17e72;hpb=64a946643e6f9159a8029be8ec9e0b71b04906f3;p=akkoma
diff --git a/lib/pleroma/web/admin_api/views/config_view.ex b/lib/pleroma/web/admin_api/views/config_view.ex
index 49add0b6e..d2d8b5907 100644
--- a/lib/pleroma/web/admin_api/views/config_view.ex
+++ b/lib/pleroma/web/admin_api/views/config_view.ex
@@ -1,21 +1,30 @@
# Pleroma: A lightweight social networking server
-# Copyright © 2017-2019 Pleroma Authors
+# Copyright © 2017-2020 Pleroma Authors
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ConfigView do
use Pleroma.Web, :view
- def render("index.json", %{configs: configs}) do
+ alias Pleroma.ConfigDB
+
+ def render("index.json", %{configs: configs} = params) do
%{
- configs: render_many(configs, __MODULE__, "show.json", as: :config)
+ configs: render_many(configs, __MODULE__, "show.json", as: :config),
+ need_reboot: params[:need_reboot]
}
end
def render("show.json", %{config: config}) do
- %{
- key: config.key,
- group: config.group,
- value: Pleroma.Web.AdminAPI.Config.from_binary_with_convert(config.value)
+ map = %{
+ key: ConfigDB.to_json_types(config.key),
+ group: ConfigDB.to_json_types(config.group),
+ value: ConfigDB.to_json_types(config.value)
}
+
+ if config.db != [] do
+ Map.put(map, :db, config.db)
+ else
+ map
+ end
end
end