mirror
/
mobilizon
mirror of https://framagit.org/framasoft/mobilizon.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'fix-comment-threads' into 'master' 

Fix comment threads display

See merge request framasoft/mobilizon!466
This commit is contained in:
Thomas Citharel 2020-06-15 10:10:23 +02:00
parent 33e9b80b95 790f333e4a
commit 9063772e35
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/src/graphql/comment.ts
View File

@ -58,11 +58,11 @@ export const COMMENTS_THREADS = gql`
id
uuid
comments {
...CommentFields
...CommentRecursive
}
}
}
${COMMENT_FIELDS_FRAGMENT}
${COMMENT_RECURSIVE_FRAGMENT}
`;
export const CREATE_COMMENT_FROM_EVENT = gql`

4
lib/graphql/schema/event.ex
View File

@ -8,7 +8,7 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
import Absinthe.Resolution.Helpers, only: [dataloader: 1]
import Mobilizon.GraphQL.Helpers.Error
alias Mobilizon.{Actors, Addresses, Events}
alias Mobilizon.{Actors, Addresses, Conversations, Events}
alias Mobilizon.GraphQL.Resolvers.{Event, Picture, Tag}
alias Mobilizon.GraphQL.Schema
@ -79,7 +79,7 @@ defmodule Mobilizon.GraphQL.Schema.EventType do
)
field(:comments, list_of(:comment), description: "The comments in reply to the event") do
resolve(dataloader(Events))
resolve(dataloader(Conversations))
end
# field(:tracks, list_of(:track))