From 70eb7b8fdf98c727a6c8948e8f3078ff0261e2b1 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Thu, 11 Sep 2014 10:45:59 +1000
Subject: [PATCH] FEATURE: All on user page is now only should posts + topics
---
app/assets/javascripts/discourse/models/user.js | 5 ++++-
app/assets/javascripts/discourse/models/user_stream.js | 6 ++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js
index b12c778fa..4ac435769 100644
--- a/app/assets/javascripts/discourse/models/user.js
+++ b/app/assets/javascripts/discourse/models/user.js
@@ -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'),
diff --git a/app/assets/javascripts/discourse/models/user_stream.js b/app/assets/javascripts/discourse/models/user_stream.js
index 82e982611..13c807f94 100644
--- a/app/assets/javascripts/discourse/models/user_stream.js
+++ b/app/assets/javascripts/discourse/models/user_stream.js
@@ -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'),