IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-30 20:54:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3170 from riking/show_mentions

Browse Source 
FEATURE: Mentions stream on user profile
This commit is contained in:
Régis Hanol 2015-02-05 12:47:22 +01:00
commit 48de485f72
4 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/javascripts/discourse/models/user_action_stat.js
View File

@ -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')

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

@ -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(",");
}

5
app/assets/javascripts/discourse/routes/user-activity-mentions.js.es6 Normal file
View File

@ -0,0 +1,5 @@
import UserActivityStreamRoute from "discourse/routes/user-activity-stream";
export default UserActivityStreamRoute.extend({
userActionType: Discourse.UserAction.TYPES["mentions"]
});

1
app/assets/javascripts/discourse/views/activity-filter.js.es6
View File

@ -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")
});