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

discourse · Sep 11, 2014 · 70eb7b8 · 70eb7b8
1 parent 5267208
commit 70eb7b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -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'),