diff --git a/lib/philomena_web/controllers/api/json/forum/topic/post_controller.ex b/lib/philomena_web/controllers/api/json/forum/topic/post_controller.ex index 2e1002d4..f064daba 100644 --- a/lib/philomena_web/controllers/api/json/forum/topic/post_controller.ex +++ b/lib/philomena_web/controllers/api/json/forum/topic/post_controller.ex @@ -52,7 +52,6 @@ defmodule PhilomenaWeb.Api.Json.Forum.Topic.PostController do _ -> json(conn, %{ posts: Enum.map(posts, &PostJson.as_json/1), - page: page, total: hd(posts).topic.post_count }) end diff --git a/lib/philomena_web/controllers/api/json/forum/topic_controller.ex b/lib/philomena_web/controllers/api/json/forum/topic_controller.ex index 96da55aa..0cf3adf4 100644 --- a/lib/philomena_web/controllers/api/json/forum/topic_controller.ex +++ b/lib/philomena_web/controllers/api/json/forum/topic_controller.ex @@ -38,6 +38,9 @@ defmodule PhilomenaWeb.Api.Json.Forum.TopicController do |> preload([:user]) |> Repo.paginate(conn.assigns.scrivener) - json(conn, %{topic: Enum.map(topics, &TopicJson.as_json/1)}) + json(conn, %{ + topic: Enum.map(topics, &TopicJson.as_json/1), + total: topics.total_entries + }) end end diff --git a/lib/philomena_web/controllers/api/json/forums_controller.ex b/lib/philomena_web/controllers/api/json/forums_controller.ex index a54b28f3..8b7876e0 100644 --- a/lib/philomena_web/controllers/api/json/forums_controller.ex +++ b/lib/philomena_web/controllers/api/json/forums_controller.ex @@ -29,8 +29,11 @@ defmodule PhilomenaWeb.Api.Json.ForumController do Forum |> where(access_level: "normal") |> order_by(asc: :name) - |> Repo.all() + |> Repo.paginate(conn.assigns.scrivener) - json(conn, %{forums: Enum.map(forums, &ForumJson.as_json/1)}) + json(conn, %{ + forums: Enum.map(forums, &ForumJson.as_json/1), + total: forums.total_entries + }) end end