diff options
| author | Mark Felder <feld@FreeBSD.org> | 2020-10-12 17:42:27 -0500 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2021-01-15 11:24:46 -0600 |
| commit | 860b5c78048ede3597a02b6029634d74fd520204 (patch) | |
| tree | a9268819d41ae978c17d4bdfbb80c936301b094d /lib/pleroma/web/admin_api | |
| parent | cf367fdbd53b50f4324a01ddabdc0520cd787321 (diff) | |
| download | pleroma-860b5c78048ede3597a02b6029634d74fd520204.tar.gz | |
Change user.deactivated field to user.is_active
Diffstat (limited to 'lib/pleroma/web/admin_api')
| -rw-r--r-- | lib/pleroma/web/admin_api/controllers/user_controller.ex | 4 | ||||
| -rw-r--r-- | lib/pleroma/web/admin_api/views/account_view.ex | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/user_controller.ex b/lib/pleroma/web/admin_api/controllers/user_controller.ex index fa710c7ec..83dd3c918 100644 --- a/lib/pleroma/web/admin_api/controllers/user_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/user_controller.ex @@ -172,9 +172,9 @@ defmodule Pleroma.Web.AdminAPI.UserController do def toggle_activation(%{assigns: %{user: admin}} = conn, %{"nickname" => nickname}) do user = User.get_cached_by_nickname(nickname) - {:ok, updated_user} = User.deactivate(user, !user.deactivated) + {:ok, updated_user} = User.deactivate(user, !user.is_active) - action = if user.deactivated, do: "activate", else: "deactivate" + action = if !user.is_active, do: "activate", else: "deactivate" ModerationLog.insert_log(%{ actor: admin, diff --git a/lib/pleroma/web/admin_api/views/account_view.ex b/lib/pleroma/web/admin_api/views/account_view.ex index 37188bfeb..c4be096a9 100644 --- a/lib/pleroma/web/admin_api/views/account_view.ex +++ b/lib/pleroma/web/admin_api/views/account_view.ex @@ -73,7 +73,7 @@ defmodule Pleroma.Web.AdminAPI.AccountView do "avatar" => avatar, "nickname" => user.nickname, "display_name" => display_name, - "deactivated" => user.deactivated, + "is_active" => user.is_active, "local" => user.local, "roles" => User.roles(user), "tags" => user.tags || [], |