From f1a4c3163b18692a7a8bd9874a45e75a6535dd5a Mon Sep 17 00:00:00 2001 From: Maxim Filippov Date: Fri, 1 Mar 2019 20:23:03 +0300 Subject: [PATCH] Show current user in users list as well --- lib/pleroma/user.ex | 3 +- .../web/admin_api/admin_api_controller.ex | 2 +- .../admin_api/admin_api_controller_test.exs | 45 ++++++++++--------- 3 files changed, 27 insertions(+), 23 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 @@ def search(term, options \\ %{}) 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 @@ def untag_users(conn, %{"nicknames" => nicknames, "tags" => tags}) 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 diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs index 460f2a6bd..0679f5dfe 100644 --- a/test/web/admin_api/admin_api_controller_test.exs +++ b/test/web/admin_api/admin_api_controller_test.exs @@ -345,6 +345,11 @@ test "renders users array for the first page" do "count" => 1, "page_size" => 50, "users" => [ + %{ + "deactivated" => admin.info.deactivated, + "id" => admin.id, + "nickname" => admin.nickname + }, %{ "deactivated" => user.info.deactivated, "id" => user.id, @@ -399,16 +404,16 @@ test "regular search" do |> get("/api/pleroma/admin/users/search?query=bo") assert json_response(conn, 200) == %{ - "count" => 1, - "page_size" => 50, - "users" => [ - %{ - "deactivated" => user.info.deactivated, - "id" => user.id, - "nickname" => user.nickname - } - ] - } + "count" => 1, + "page_size" => 50, + "users" => [ + %{ + "deactivated" => user.info.deactivated, + "id" => user.id, + "nickname" => user.nickname + } + ] + } end test "only local users" do @@ -423,16 +428,16 @@ test "only local users" do |> get("/api/pleroma/admin/users/search?query=bo&local=true") assert json_response(conn, 200) == %{ - "count" => 1, - "page_size" => 50, - "users" => [ - %{ - "deactivated" => user.info.deactivated, - "id" => user.id, - "nickname" => user.nickname - } - ] - } + "count" => 1, + "page_size" => 50, + "users" => [ + %{ + "deactivated" => user.info.deactivated, + "id" => user.id, + "nickname" => user.nickname + } + ] + } end end end