From 2154f5478a7f498705b4c133830e4205d88d0389 Mon Sep 17 00:00:00 2001
From: riking <rikingcoding@gmail.com>
Date: Wed, 4 Feb 2015 19:40:17 -0800
Subject: [PATCH] FEATURE: Mentions stream on user profile
---
app/assets/javascripts/discourse/models/user_action_stat.js | 1 -
app/assets/javascripts/discourse/models/user_stream.js | 1 -
.../discourse/routes/user-activity-mentions.js.es6 | 5 +++++
.../javascripts/discourse/views/activity-filter.js.es6 | 1 +
4 files changed, 6 insertions(+), 2 deletions(-)
create mode 100644 app/assets/javascripts/discourse/routes/user-activity-mentions.js.es6
diff --git a/app/assets/javascripts/discourse/models/user_action_stat.js b/app/assets/javascripts/discourse/models/user_action_stat.js
index 7a73d3bca..942f22e96 100644
--- a/app/assets/javascripts/discourse/models/user_action_stat.js
+++ b/app/assets/javascripts/discourse/models/user_action_stat.js
@@ -19,7 +19,6 @@ Discourse.UserActionStat = Discourse.Model.extend({
isResponse: function() {
var actionType = this.get('action_type');
return actionType === Discourse.UserAction.TYPES.replies ||
- actionType === Discourse.UserAction.TYPES.mentions ||
actionType === Discourse.UserAction.TYPES.quotes;
}.property('action_type')
diff --git a/app/assets/javascripts/discourse/models/user_stream.js b/app/assets/javascripts/discourse/models/user_stream.js
index 0dd256d18..9d871055e 100644
--- a/app/assets/javascripts/discourse/models/user_stream.js
+++ b/app/assets/javascripts/discourse/models/user_stream.js
@@ -20,7 +20,6 @@ Discourse.UserStream = Discourse.Model.extend({
var filter = this.get('filter');
if (filter === Discourse.UserAction.TYPES.replies) {
return [Discourse.UserAction.TYPES.replies,
- Discourse.UserAction.TYPES.mentions,
Discourse.UserAction.TYPES.quotes].join(",");
}
diff --git a/app/assets/javascripts/discourse/routes/user-activity-mentions.js.es6 b/app/assets/javascripts/discourse/routes/user-activity-mentions.js.es6
new file mode 100644
index 000000000..ae90417db
--- /dev/null
+++ b/app/assets/javascripts/discourse/routes/user-activity-mentions.js.es6
@@ -0,0 +1,5 @@
+import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
+
+export default UserActivityStreamRoute.extend({
+ userActionType: Discourse.UserAction.TYPES["mentions"]
+});
diff --git a/app/assets/javascripts/discourse/views/activity-filter.js.es6 b/app/assets/javascripts/discourse/views/activity-filter.js.es6
index 7a7ed0f2a..52505710b 100644
--- a/app/assets/javascripts/discourse/views/activity-filter.js.es6
+++ b/app/assets/javascripts/discourse/views/activity-filter.js.es6
@@ -54,6 +54,7 @@ export default Ember.Component.extend(StringBuffer, {
case Discourse.UserAction.TYPES.bookmarks: return "bookmark";
case Discourse.UserAction.TYPES.edits: return "pencil";
case Discourse.UserAction.TYPES.replies: return "reply";
+ case Discourse.UserAction.TYPES.mentions: return "at";
}
}.property("content.action_type")
});