pleroma

commit: 43bd7f47db7f2a31c59ec3f48cf22a51847ae241
parent: a5675c965ab35c41ff339f38e843f5a1c0472075
Author: kaniini <nenolod@gmail.com>
Date:   Mon, 18 Mar 2019 23:08:31 +0000

Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'

Order users by nickname

See merge request pleroma/pleroma!945
Diffstat:
M
lib/pleroma/user.ex
2
+-
M
test/upload_test.exs
3
+--
M
test/web/admin_api/admin_api_controller_test.exs
16
++++++++--------

3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
@@ -773,7 +773,7 @@ defmodule Pleroma.User do
         }) :: {:ok, [Pleroma.User.t()], number()}
   def search_for_admin(%{query: nil, local: local, page: page, page_size: page_size}) do
     query =
-      from(u in User, order_by: u.id)
+      from(u in User, order_by: u.nickname)
       |> maybe_local_user_query(local)
 
     paginated_query =
diff --git a/test/upload_test.exs b/test/upload_test.exs
@@ -150,8 +150,7 @@ defmodule Pleroma.UploadTest do
       {:ok, data} = Upload.store(file)
       [attachment_url | _] = data["url"]
 
-      assert Path.basename(attachment_url["href"]) ==
-               "an%E2%80%A6%20image.jpg"
+      assert Path.basename(attachment_url["href"]) == "an%E2%80%A6%20image.jpg"
     end
 
     test "escapes reserved uri characters" do
diff --git a/test/web/admin_api/admin_api_controller_test.exs b/test/web/admin_api/admin_api_controller_test.exs
@@ -495,20 +495,20 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIControllerTest do
                "page_size" => 50,
                "users" => [
                  %{
-                   "deactivated" => admin.info.deactivated,
-                   "id" => admin.id,
-                   "nickname" => admin.nickname,
-                   "roles" => %{"admin" => true, "moderator" => false},
-                   "local" => true,
-                   "tags" => []
-                 },
-                 %{
                    "deactivated" => user.info.deactivated,
                    "id" => user.id,
                    "nickname" => user.nickname,
                    "roles" => %{"admin" => false, "moderator" => false},
                    "local" => true,
                    "tags" => []
+                 },
+                 %{
+                   "deactivated" => admin.info.deactivated,
+                   "id" => admin.id,
+                   "nickname" => admin.nickname,
+                   "roles" => %{"admin" => true, "moderator" => false},
+                   "local" => true,
+                   "tags" => []
                  }
                ]
              }