diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-03-01 20:23:03 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-03-01 20:23:03 +0300 |
| commit | f1a4c3163b18692a7a8bd9874a45e75a6535dd5a (patch) | |
| tree | d36b7aedbd624bce3a0736ec19c484250891840d /lib | |
| parent | 5b08b470f69738f4528455a58fefe3a8d4acae02 (diff) | |
| download | pleroma-f1a4c3163b18692a7a8bd9874a45e75a6535dd5a.tar.gz pleroma-f1a4c3163b18692a7a8bd9874a45e75a6535dd5a.zip | |
Show current user in users list as well
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 3 | ||||
| -rw-r--r-- | lib/pleroma/web/admin_api/admin_api_controller.ex | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index af3ce705d..37f8da892 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -779,10 +779,9 @@ defmodule Pleroma.User do Enum.uniq_by(fts_results ++ trigram_results, & &1.id) end - def all_except_one(user, page, page_size) do + def all(page, page_size) do from( u in User, - where: u.id != ^user.id, limit: ^page_size, offset: ^((page - 1) * page_size), order_by: u.id diff --git a/lib/pleroma/web/admin_api/admin_api_controller.ex b/lib/pleroma/web/admin_api/admin_api_controller.ex index a8f9e5012..270097d35 100644 --- a/lib/pleroma/web/admin_api/admin_api_controller.ex +++ b/lib/pleroma/web/admin_api/admin_api_controller.ex @@ -65,7 +65,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do def list_users(%{assigns: %{user: admin}} = conn, %{"page" => page_string}) do with {page, _} <- Integer.parse(page_string), - users <- User.all_except_one(admin, page, @users_page_size), + users <- User.all(page, @users_page_size), count <- User.count_all_except_one(admin), do: conn |