diff --git a/app/assets/javascripts/discourse/models/group.js.es6 b/app/assets/javascripts/discourse/models/group.js.es6 index c06d5966300..4c6d31ce150 100644 --- a/app/assets/javascripts/discourse/models/group.js.es6 +++ b/app/assets/javascripts/discourse/models/group.js.es6 @@ -2,6 +2,9 @@ import { ajax } from 'discourse/lib/ajax'; import { default as computed, observes } from "ember-addons/ember-computed-decorators"; import GroupHistory from 'discourse/models/group-history'; import RestModel from 'discourse/models/rest'; +import Category from "discourse/models/category"; +import User from "discourse/models/user"; +import Topic from "discourse/models/topic"; const Group = RestModel.extend({ limit: 50, @@ -44,9 +47,9 @@ const Group = RestModel.extend({ if (ownerIds[member.id]) { member.owner = true; } - return Discourse.User.create(member); + return User.create(member); }), - owners: result.owners.map(owner => Discourse.User.create(owner)), + owners: result.owners.map(owner => User.create(owner)), }); }); }, @@ -207,8 +210,9 @@ const Group = RestModel.extend({ return 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); + p.user = User.create(p.user); + p.topic = Topic.create(p.topic); + p.category = Category.findById(p.category_id); return Em.Object.create(p); }); }); diff --git a/app/serializers/group_post_serializer.rb b/app/serializers/group_post_serializer.rb index 99a06f55340..f21802cfbda 100644 --- a/app/serializers/group_post_serializer.rb +++ b/app/serializers/group_post_serializer.rb @@ -7,7 +7,7 @@ class GroupPostSerializer < ApplicationSerializer :created_at, :title, :url, - :category, + :category_id, :post_number, :topic_id @@ -22,7 +22,7 @@ class GroupPostSerializer < ApplicationSerializer SiteSetting.enable_names? end - def category - object.topic.category + def category_id + object.topic.category_id end end