projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
[akkoma]
/
lib
/
pleroma
/
web
/
admin_api
/
views
/
config_view.ex
diff --git
a/lib/pleroma/web/admin_api/views/config_view.ex
b/lib/pleroma/web/admin_api/views/config_view.ex
index 587ef760ee0c51ae6059cbeba789186880a249bb..d29b4963dec2e9bf71e0446cf6f9bee4d4453775 100644
(file)
--- a/
lib/pleroma/web/admin_api/views/config_view.ex
+++ b/
lib/pleroma/web/admin_api/views/config_view.ex
@@
-1,27
+1,24
@@
# Pleroma: A lightweight social networking server
# Pleroma: A lightweight social networking server
-# Copyright © 2017-202
0
Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-202
1
Pleroma Authors <https://pleroma.social/>
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ConfigView do
use Pleroma.Web, :view
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.AdminAPI.ConfigView do
use Pleroma.Web, :view
+ alias Pleroma.ConfigDB
+
def render("index.json", %{configs: configs} = params) do
def render("index.json", %{configs: configs} = params) do
- map = %{
- configs: render_many(configs, __MODULE__, "show.json", as: :config)
+ %{
+ configs: render_many(configs, __MODULE__, "show.json", as: :config),
+ need_reboot: params[:need_reboot]
}
}
-
- if params[:need_reboot] do
- Map.put(map, :need_reboot, true)
- else
- map
- end
end
def render("show.json", %{config: config}) do
map = %{
end
def render("show.json", %{config: config}) do
map = %{
- key:
config.key
,
- group:
config.group
,
- value:
Pleroma.ConfigDB.from_binary_with_convert
(config.value)
+ 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
}
if config.db != [] do