diff options
author | lain <lain@soykaf.club> | 2020-06-02 08:49:24 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2020-06-02 08:49:24 +0000 |
commit | d111eae798eb80089acc15ad2b9c0297febfaee1 (patch) | |
tree | f26982e0501e0c3c83d14ab3040895be60452185 /lib/pleroma/web/admin_api/controllers | |
parent | 6fb900a496e1797c1a3b438db9f96b09d9546f1d (diff) | |
parent | 8f08384d8058f61753c28d37c90b47a2886f348c (diff) | |
download | pleroma-d111eae798eb80089acc15ad2b9c0297febfaee1.tar.gz |
Merge branch 'feature/status-by-id-account-view' into 'develop'
another view for account in admin-fe status_show
Closes #1783
See merge request pleroma/pleroma!2543
Diffstat (limited to 'lib/pleroma/web/admin_api/controllers')
-rw-r--r-- | lib/pleroma/web/admin_api/controllers/status_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/admin_api/controllers/status_controller.ex b/lib/pleroma/web/admin_api/controllers/status_controller.ex index 08cb9c10b..c91fbc771 100644 --- a/lib/pleroma/web/admin_api/controllers/status_controller.ex +++ b/lib/pleroma/web/admin_api/controllers/status_controller.ex @@ -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} |