IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: link to sub-categories in group activity feed wasn't working

Browse Source
This commit is contained in:
Régis Hanol 2017-09-13 23:14:46 +02:00
parent 7a4ddc2bb1
commit 7aa0d044de
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/assets/javascripts/discourse/models/group.js.es6
View File

@ -2,6 +2,9 @@ import { ajax } from 'discourse/lib/ajax';
import { default as computed, observes } from "ember-addons/ember-computed-decorators"; import { default as computed, observes } from "ember-addons/ember-computed-decorators";
import GroupHistory from 'discourse/models/group-history'; import GroupHistory from 'discourse/models/group-history';
import RestModel from 'discourse/models/rest'; 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({ const Group = RestModel.extend({
limit: 50, limit: 50,
@ -44,9 +47,9 @@ const Group = RestModel.extend({
if (ownerIds[member.id]) { if (ownerIds[member.id]) {
member.owner = true; 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 ajax(`/groups/${this.get('name')}/${type}.json`, { data: data }).then(posts => {
return posts.map(p => { return posts.map(p => {
p.user = Discourse.User.create(p.user); p.user = User.create(p.user);
p.topic = Discourse.Topic.create(p.topic); p.topic = Topic.create(p.topic);
p.category = Category.findById(p.category_id);
return Em.Object.create(p); return Em.Object.create(p);
}); });
}); });

6
app/serializers/group_post_serializer.rb
View File

@ -7,7 +7,7 @@ class GroupPostSerializer < ApplicationSerializer
:created_at, :created_at,
:title, :title,
:url, :url,
:category, :category_id,
:post_number, :post_number,
:topic_id :topic_id
@ -22,7 +22,7 @@ class GroupPostSerializer < ApplicationSerializer
SiteSetting.enable_names? SiteSetting.enable_names?
end end
def category def category_id
object.topic.category object.topic.category_id
end end
end end