mirrors/akkoma
1
0
Fork 1
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-18 02:49:18 +00:00
Code Issues Wiki Activity

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

Browse source 
Order users by nickname

See merge request pleroma/pleroma!945
This commit is contained in:
kaniini 2019-03-18 23:08:31 +00:00
parent a5675c965a 22ca1d1dfe
commit 43bd7f47db
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/user.ex
View file

@ -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 =

3
test/upload_test.exs
View file

@ -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

16
test/web/admin_api/admin_api_controller_test.exs
View file

@ -494,14 +494,6 @@ test "only local users with no query" do
"count" => 2,
"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,
@ -509,6 +501,14 @@ test "only local users with no query" do
"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" => []
}
]
}