From 3dbb4ff9bc7a019413a673b8638820015156fd99 Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 8 Jul 2013 12:12:06 +1000 Subject: [PATCH] Reorder filters on user page and name them better (All, Topics, Posts, Responses) --- app/assets/javascripts/discourse/models/user.js | 9 ++++++++- config/locales/client.en.yml | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/discourse/models/user.js b/app/assets/javascripts/discourse/models/user.js index d45808b5111..a635eeb0e16 100644 --- a/app/assets/javascripts/discourse/models/user.js +++ b/app/assets/javascripts/discourse/models/user.js @@ -353,8 +353,15 @@ Discourse.User.reopenClass({ }); var result = Em.A(); - result.pushObject(responses); result.pushObjects(stats.rejectProperty('isResponse')); + + var insertAt = 1; + result.forEach(function(item, index){ + if(item.action_type === Discourse.UserAction.NEW_TOPIC || item.action_type === Discourse.UserAction.POST){ + insertAt = index + 1; + } + }); + result.insertAt(insertAt, responses); return(result); }, diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index 3f572270161..454dd195176 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -146,7 +146,7 @@ en: "2": "Likes Received" "3": "Bookmarks" "4": "Topics" - "5": "Replies" + "5": "Posts" "6": "Responses" "7": "Mentions" "9": "Quotes"