a1batross
/
pleroma
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Merge branch 'admin-api/account-view' into 'develop' 

Use AdminAPI.StatusView in api/admin/users

Closes #1836

See merge request pleroma/pleroma!2627
This commit is contained in:
lain 2020-06-03 11:28:56 +00:00
parent 12c2b3b831 8a43611e01
commit d28d88766b
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
View File

@ -30,7 +30,6 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
alias Pleroma.Web.AdminAPI.Search
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.Endpoint
alias Pleroma.Web.MastodonAPI
alias Pleroma.Web.Router
require Logger
@ -279,7 +278,7 @@ defmodule Pleroma.Web.AdminAPI.AdminAPIController do
})
conn
|> put_view(MastodonAPI.StatusView)
|> put_view(AdminAPI.StatusView)
|> render("index.json", %{activities: activities, as: :activity})
else
_ -> {:error, :not_found}