diff options
| author | kaniini <nenolod@gmail.com> | 2019-03-18 23:08:31 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-03-18 23:08:31 +0000 |
| commit | 43bd7f47db7f2a31c59ec3f48cf22a51847ae241 (patch) | |
| tree | 12516016c66748e060768b3dc34482205baf5246 /lib | |
| parent | a5675c965ab35c41ff339f38e843f5a1c0472075 (diff) | |
| parent | 22ca1d1dfee4ea8624222560f1008ea84879f94a (diff) | |
| download | pleroma-43bd7f47db7f2a31c59ec3f48cf22a51847ae241.tar.gz | |
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
Order users by nickname
See merge request pleroma/pleroma!945
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/user.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index f72bc4bce..fb3bd121d 100644 --- 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 = |