Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FEATURE: All on user page is now only should posts + topics

This commit is contained in:
Sam 2014-09-11 10:45:59 +10:00
parent 52672088a0
commit 70eb7b8fdf
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/models/user.js
View File

@ -276,7 +276,10 @@ Discourse.User = Discourse.Model.extend({
if (this.blank('statsExcludingPms')) return 0;
var count = 0;
_.each(this.get('statsExcludingPms'), function(val) {
count += val.count;
if (val.action_type === Discourse.UserAction.TYPES.posts ||
val.action_type === Discourse.UserAction.TYPES.topics ) {
count += val.count;
}
});
return count;
}.property('statsExcludingPms.@each.count'),

6
app/assets/javascripts/discourse/models/user_stream.js
View File

@ -23,6 +23,12 @@ Discourse.UserStream = Discourse.Model.extend({
Discourse.UserAction.TYPES.mentions,
Discourse.UserAction.TYPES.quotes].join(",");
}
if(!filter) {
return [Discourse.UserAction.TYPES.posts,
Discourse.UserAction.TYPES.topics];
}
return filter;
}.property('filter'),