diff options
Diffstat (limited to 'lib/pleroma')
| -rw-r--r-- | lib/pleroma/config/transfer_task.ex | 2 | ||||
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lib/pleroma/config/transfer_task.ex b/lib/pleroma/config/transfer_task.ex index c89c1fcc8..75c4aa739 100644 --- a/lib/pleroma/config/transfer_task.ex +++ b/lib/pleroma/config/transfer_task.ex @@ -17,7 +17,7 @@ defmodule Pleroma.Config.TransferTask do end def load_and_update_env do - with true <- Pleroma.Config.get([:instance, :dynamic_configuration]), + with true <- Pleroma.Config.get([:configurable_from_database]), true <- Ecto.Adapters.SQL.table_exists?(Repo, "config"), started_applications <- Application.started_applications() do # We need to restart applications for loaded settings take effect diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index d12ed459d..849641113 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -785,7 +785,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do end def migrate_from_db(conn, _params) do - with :ok <- check_dynamic_configuration(conn) do + with :ok <- configurable_from_database(conn) do Mix.Tasks.Pleroma.Config.run([ "migrate_from_db", "--env", @@ -798,7 +798,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do end def config_show(conn, _params) do - with :ok <- check_dynamic_configuration(conn) do + with :ok <- configurable_from_database(conn) do configs = Pleroma.Repo.all(Config) if configs == [] do @@ -812,7 +812,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do end def config_update(conn, %{"configs" => configs}) do - with :ok <- check_dynamic_configuration(conn) do + with :ok <- configurable_from_database(conn) do updated = Enum.map(configs, fn %{"group" => group, "key" => key, "delete" => true} = params -> @@ -843,8 +843,8 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do end end - defp check_dynamic_configuration(conn) do - if Pleroma.Config.get([:instance, :dynamic_configuration]) do + defp configurable_from_database(conn) do + if Pleroma.Config.get([:configurable_from_database]) do :ok else errors(conn, {:error, "To use this endpoint you need to enable dynamic configuration."}) |
