hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'feature/status-by-id-account-view' into 'develop'

Browse source 
another view for account in admin-fe status_show

Closes #1783

See merge request pleroma/pleroma!2543
This commit is contained in:
lain 2020-06-02 08:49:24 +00:00
commit d111eae798
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/admin_api/controllers/status_controller.ex
View file

@ -42,7 +42,7 @@ defmodule Pleroma.Web.AdminAPI.StatusController do
def show(conn, %{id: id}) do
with %Activity{} = activity <- Activity.get_by_id(id) do
conn
|> put_view(MastodonAPI.StatusView)
|> put_view(Pleroma.Web.AdminAPI.StatusView)
|> render("show.json", %{activity: activity})
else
nil -> {:error, :not_found}