sam/pleroma
sam/pleroma
1
0
Fork 0
Code Issues Pull requests Projects 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 @@ defp configurable_from_database do
if Config.get(:configurable_from_database) do
:ok
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

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
:ok
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

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