PonyMirrors/philomena
1
0
Fork 0
mirror of https://github.com/philomena-dev/philomena.git synced 2025-02-01 03:46:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Adjusted to suit standard (#58)

Browse source
This commit is contained in:
SomewhatDamaged 2020-03-27 16:07:24 +11:00 committed by GitHub
parent 43b5e069e6
commit 44a20a7888
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/philomena_web/controllers/api/json/forum/topic/post_controller.ex
View file

@ -52,7 +52,6 @@ defmodule PhilomenaWeb.Api.Json.Forum.Topic.PostController do
_ -> _ ->
json(conn, %{ json(conn, %{
posts: Enum.map(posts, &PostJson.as_json/1), posts: Enum.map(posts, &PostJson.as_json/1),
page: page,
total: hd(posts).topic.post_count total: hd(posts).topic.post_count
}) })
end end

5
lib/philomena_web/controllers/api/json/forum/topic_controller.ex
View file

@ -38,6 +38,9 @@ defmodule PhilomenaWeb.Api.Json.Forum.TopicController do
|> preload([:user]) |> preload([:user])
|> Repo.paginate(conn.assigns.scrivener) |> 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
end end

7
lib/philomena_web/controllers/api/json/forums_controller.ex
View file

@ -29,8 +29,11 @@ defmodule PhilomenaWeb.Api.Json.ForumController do
Forum Forum
|> where(access_level: "normal") |> where(access_level: "normal")
|> order_by(asc: :name) |> 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
end end