diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6 index a34c6dcca..c2369960d 100644 --- a/app/assets/javascripts/discourse/models/group.js.es6 +++ b/app/assets/javascripts/discourse/models/group.js.es6 @@ -130,6 +130,7 @@ const Group = Discourse.Model.extend({ return Discourse.ajax(`/groups/${this.get('name')}/${type}.json`, { data: data }).then(posts => { return posts.map(p => { p.user = Discourse.User.create(p.user); + p.topic = Discourse.Topic.create(p.topic); return Em.Object.create(p); }); }); diff --git a/app/assets/javascripts/discourse/templates/components/group-post.hbs b/app/assets/javascripts/discourse/templates/components/group-post.hbs index 78abb6b53..0a379019e 100644 --- a/app/assets/javascripts/discourse/templates/components/group-post.hbs +++ b/app/assets/javascripts/discourse/templates/components/group-post.hbs @@ -3,7 +3,7 @@ <a href="{{unbound post.user.userUrl}}" data-user-card="{{unbound post.user.username}}" class='avatar-link'><div class='avatar-wrapper'>{{avatar post.user imageSize="large" extraClasses="actor" ignoreTitle="true"}}</div></a> <span class='time'>{{format-date post.created_at leaveAgo="true"}}</span> <span class="title"> - <a href="{{unbound post.url}}">{{unbound post.title}}</a> + {{topic-link post.topic}} </span> <span class="category">{{category-link post.category}}</span> <div class="group-member-info"> diff --git a/app/serializers/group_post_serializer.rb b/app/serializers/group_post_serializer.rb index c9e37bdc0..ad4806d87 100644 --- a/app/serializers/group_post_serializer.rb +++ b/app/serializers/group_post_serializer.rb @@ -6,6 +6,7 @@ class GroupPostSerializer < ApplicationSerializer :url, :user_title, :user_long_name, + :topic, :category has_one :user, serializer: BasicUserSerializer, embed: :objects @@ -26,8 +27,11 @@ class GroupPostSerializer < ApplicationSerializer SiteSetting.enable_names? end + def topic + object.topic + end + def category object.topic.category end end -