From 88476800f8ad6d12f286cf9cefe5c8a4b8871cbf Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 3 Oct 2013 15:41:38 -0400
Subject: [PATCH] FIX: Private Message link was broken

---
 .../controllers/user_activity_controller.js      | 16 +++++++++-------
 .../javascripts/discourse/routes/topic_route.js  |  8 ++++++++
 .../templates/poster_expansion.handlebars        |  2 +-
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/discourse/controllers/user_activity_controller.js b/app/assets/javascripts/discourse/controllers/user_activity_controller.js
index e765f09fee0..a17a13ea0fd 100644
--- a/app/assets/javascripts/discourse/controllers/user_activity_controller.js
+++ b/app/assets/javascripts/discourse/controllers/user_activity_controller.js
@@ -14,13 +14,15 @@ Discourse.UserActivityController = Discourse.ObjectController.extend({
            (this.get('userActionType') === Discourse.UserAction.TYPES.messages_received);
   }.property('userActionType'),
 
-  composePrivateMessage: function() {
-    return this.get('controllers.composer').open({
-      action: Discourse.Composer.PRIVATE_MESSAGE,
-      usernames: this.get('model.username'),
-      archetypeId: 'private_message',
-      draftKey: 'new_private_message'
-    });
+  actions: {
+    composePrivateMessage: function() {
+      return this.get('controllers.composer').open({
+        action: Discourse.Composer.PRIVATE_MESSAGE,
+        usernames: this.get('model.username'),
+        archetypeId: 'private_message',
+        draftKey: 'new_private_message'
+      });
+    }
   },
 
   privateMessagesActive: Em.computed.equal('pmView', 'index'),
diff --git a/app/assets/javascripts/discourse/routes/topic_route.js b/app/assets/javascripts/discourse/routes/topic_route.js
index 375a33cf4c6..94821fc0858 100644
--- a/app/assets/javascripts/discourse/routes/topic_route.js
+++ b/app/assets/javascripts/discourse/routes/topic_route.js
@@ -21,6 +21,14 @@ Discourse.TopicRoute = Discourse.Route.extend({
       });
     },
 
+    composePrivateMessage: function(user) {
+      var self = this;
+
+      Discourse.URL.routeTo("/users/" + user.get('username_lower') + "/private-messages").then(function () {
+        self.controllerFor('userActivity').send('composePrivateMessage')
+      });
+    },
+
     showFlags: function(post) {
       Discourse.Route.showModal(this, 'flag', post);
       this.controllerFor('flag').setProperties({ selected: null });
diff --git a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
index 185af36de9a..859871fc7d4 100644
--- a/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
+++ b/app/assets/javascripts/discourse/templates/poster_expansion.handlebars
@@ -8,7 +8,7 @@
   <div class='bottom'>
     {{#if bio_cooked}}<div class='bio'>{{{bio_cooked}}}</div>{{/if}}
 
-    <button class='btn'><i class='icon icon-envelope'></i>{{i18n user.private_message}}</button>
+    <button class='btn' {{action composePrivateMessage model}}><i class='icon icon-envelope'></i>{{i18n user.private_message}}</button>
 
     {{#link-to 'user' model class="btn"}}<i class='icon icon-user'></i>{{i18n user.profile}}{{/link-to}}