removing confusing error

This commit is contained in:
Alexander Strizhakov 2020-02-05 17:06:01 +03:00
parent 15cb1f6804
commit c85aa6e87f
No known key found for this signature in database
GPG Key ID: 022896A53AEF1381
3 changed files with 29 additions and 51 deletions

View File

@ -689,7 +689,6 @@ Note: Available `:permission_group` is currently moderator and admin. 404 is ret
- Response: - Response:
- On failure: - On failure:
- 400 Bad Request `"To use this endpoint you need to enable configuration from database."` - 400 Bad Request `"To use this endpoint you need to enable configuration from database."`
- 400 Bad Request `"To use configuration from database migrate your settings to database."`
```json ```json
{ {

View File

@ -797,29 +797,16 @@ def config_show(conn, %{"only_db" => true}) do
with :ok <- configurable_from_database(conn) do with :ok <- configurable_from_database(conn) do
configs = Pleroma.Repo.all(ConfigDB) configs = Pleroma.Repo.all(ConfigDB)
if configs == [] do
errors(
conn,
{:error, "To use configuration from database migrate your settings to database."}
)
else
conn conn
|> put_view(ConfigView) |> put_view(ConfigView)
|> render("index.json", %{configs: configs}) |> render("index.json", %{configs: configs})
end end
end end
end
def config_show(conn, _params) do def config_show(conn, _params) do
with :ok <- configurable_from_database(conn) do with :ok <- configurable_from_database(conn) do
configs = ConfigDB.get_all_as_keyword() configs = ConfigDB.get_all_as_keyword()
if configs == [] do
errors(
conn,
{:error, "To use configuration from database migrate your settings to database."}
)
else
merged = merged =
Pleroma.Config.Holder.config() Pleroma.Config.Holder.config()
|> ConfigDB.merge(configs) |> ConfigDB.merge(configs)
@ -854,7 +841,6 @@ def config_show(conn, _params) do
json(conn, %{configs: merged}) json(conn, %{configs: merged})
end end
end end
end
def config_update(conn, %{"configs" => configs}) do def config_update(conn, %{"configs" => configs}) do
with :ok <- configurable_from_database(conn) do with :ok <- configurable_from_database(conn) do

View File

@ -1899,13 +1899,6 @@ test "when configuration from database is off", %{conn: conn} do
"To use this endpoint you need to enable configuration from database." "To use this endpoint you need to enable configuration from database."
end end
test "without any settings in db", %{conn: conn} do
conn = get(conn, "/api/pleroma/admin/config")
assert json_response(conn, 400) ==
"To use configuration from database migrate your settings to database."
end
test "with settings only in db", %{conn: conn} do test "with settings only in db", %{conn: conn} do
config1 = insert(:config) config1 = insert(:config)
config2 = insert(:config) config2 = insert(:config)