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: streaming incorrect events into all tab

Browse Source
This commit is contained in:
Sam 2014-10-08 13:35:07 +11:00
parent 67429b29a5
commit b9a9fb54da
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -258,7 +258,10 @@ Discourse.User = Discourse.Model.extend({
return Discourse.ajax("/user_actions/" + id + ".json", { cache: 'false' }).then(function(result) { return Discourse.ajax("/user_actions/" + id + ".json", { cache: 'false' }).then(function(result) {
if (result && result.user_action) { if (result && result.user_action) {
var ua = result.user_action; var ua = result.user_action;
if ((self.get('stream.filter') || ua.action_type) !== ua.action_type) return; if ((self.get('stream.filter') || ua.action_type) !== ua.action_type) return;
if (!self.get('stream.filter') && !self.inAllStream(ua)) return;
var action = Discourse.UserAction.collapseStream([Discourse.UserAction.create(ua)]); var action = Discourse.UserAction.collapseStream([Discourse.UserAction.create(ua)]);
stream.set('itemsLoaded', stream.get('itemsLoaded') + 1); stream.set('itemsLoaded', stream.get('itemsLoaded') + 1);
stream.get('content').insertAt(0, action[0]); stream.get('content').insertAt(0, action[0]);
@ -266,6 +269,11 @@ Discourse.User = Discourse.Model.extend({
}); });
}, },
inAllStream: function(ua) {
return ua.action_type === Discourse.UserAction.TYPES.posts ||
ua.action_type === Discourse.UserAction.TYPES.topics;
},
/** /**
The user's stat count, excluding PMs. The user's stat count, excluding PMs.
@ -273,11 +281,12 @@ Discourse.User = Discourse.Model.extend({
@type {Integer} @type {Integer}
**/ **/
statsCountNonPM: function() { statsCountNonPM: function() {
var self = this;
if (this.blank('statsExcludingPms')) return 0; if (this.blank('statsExcludingPms')) return 0;
var count = 0; var count = 0;
_.each(this.get('statsExcludingPms'), function(val) { _.each(this.get('statsExcludingPms'), function(val) {
if (val.action_type === Discourse.UserAction.TYPES.posts || if (self.inAllStream(val)){
val.action_type === Discourse.UserAction.TYPES.topics ) {
count += val.count; count += val.count;
} }
}); });