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

Merge branch 'fix/configdb-error' into 'develop'

Browse Source 
Improve error message for ConfigDB

See merge request pleroma/pleroma!3289
This commit is contained in:
feld 2021-02-04 14:33:59 +00:00
commit 7b67bf4e97
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

@ -406,7 +406,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController 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 @@ defmodule Pleroma.Web.AdminAPI.ConfigController 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 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest 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 @@ defmodule Pleroma.Web.AdminAPI.ConfigControllerTest 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