alyssa
/
pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improve error message for ConfigDB

This commit is contained in:
Mark Felder 2021-01-28 14:57:24 -06:00
parent 7f07871639
commit 5fcab23aa3
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
View File

@ -404,7 +404,7 @@ defp configurable_from_database do
if Config.get(:configurable_from_database) do if Config.get(:configurable_from_database) do
:ok :ok
else else
{:error, "To use this endpoint you need to enable configuration from database."} {:error, "You must enable configurable_from_database in your config file."}
end end
end end

2
lib/pleroma/web/admin_api/controllers/config_controller.ex
View File

@ -122,7 +122,7 @@ defp configurable_from_database do
if Config.get(:configurable_from_database) do if Config.get(:configurable_from_database) do
:ok :ok
else else
{:error, "To use this endpoint you need to enable configuration from database."} {:error, "You must enable configurable_from_database in your config file."}
end end
end end

4
test/pleroma/web/admin_api/controllers/config_controller_test.exs
View File

@ -31,7 +31,7 @@ test "when configuration from database is off", %{conn: conn} do
assert json_response_and_validate_schema(conn, 400) == assert json_response_and_validate_schema(conn, 400) ==
%{ %{
"error" => "To use this endpoint you need to enable configuration from database." "error" => "You must enable configurable_from_database in your config file."
} }
end end
@ -170,7 +170,7 @@ test "POST /api/pleroma/admin/config with configdb disabled", %{conn: conn} do
|> post("/api/pleroma/admin/config", %{"configs" => []}) |> post("/api/pleroma/admin/config", %{"configs" => []})
assert json_response_and_validate_schema(conn, 400) == assert json_response_and_validate_schema(conn, 400) ==
%{"error" => "To use this endpoint you need to enable configuration from database."} %{"error" => "You must enable configurable_from_database in your config file."}
end end
describe "POST /api/pleroma/admin/config" do describe "POST /api/pleroma/admin/config" do