Order users by nickname
This commit is contained in:
parent
6d6f48d079
commit
93291c3d7a
2 changed files with 2 additions and 3 deletions
|
@ -773,7 +773,7 @@ def get_recipients_from_activity(%Activity{recipients: to}) 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 =
|
||||
|
|
|
@ -150,8 +150,7 @@ test "escapes invalid characters in url" 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
|
||||
|
|
Loading…
Reference in a new issue