diff --git a/app/assets/javascripts/discourse/components/utilities.js b/app/assets/javascripts/discourse/components/utilities.js index 4b608aa7b55..4d3773de828 100644 --- a/app/assets/javascripts/discourse/components/utilities.js +++ b/app/assets/javascripts/discourse/components/utilities.js @@ -96,6 +96,10 @@ Discourse.Utilities = { return url; }, + userUrl: function(username) { + return Discourse.getURL("/users/" + username); + }, + emailValid: function(email) { // see: http://stackoverflow.com/questions/46155/validate-email-address-in-javascript var re; diff --git a/app/assets/javascripts/discourse/models/user_action.js b/app/assets/javascripts/discourse/models/user_action.js index 1a53422935e..207bf362e66 100644 --- a/app/assets/javascripts/discourse/models/user_action.js +++ b/app/assets/javascripts/discourse/models/user_action.js @@ -8,6 +8,10 @@ **/ Discourse.UserAction = Discourse.Model.extend({ + userUrl: (function() { + return Discourse.Utilities.userUrl(this.get('username')); + }).property(), + postUrl: (function() { return Discourse.Utilities.postUrl(this.get('slug'), this.get('topic_id'), this.get('post_number')); }).property(), diff --git a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars index 2a195fb5751..bf65deb8ebc 100644 --- a/app/assets/javascripts/discourse/templates/user/stream.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/stream.js.handlebars @@ -2,7 +2,7 @@ {{#collection contentBinding="stream" itemClass="item"}} {{#with view.content}}
-
{{avatar this imageSize="large" extraClasses="actor" ignoreTitle="true"}}
+
{{avatar this imageSize="large" extraClasses="actor" ignoreTitle="true"}}
{{date path="created_at" leaveAgo="true"}} {{unbound title}} @@ -17,7 +17,7 @@ {{/if}} {{/unless}} - {{personalizedName name usernamePath="username"}} + {{personalizedName name usernamePath="username"}} {{#if description}} {{unbound description}} {{#if isPostAction}} @@ -40,7 +40,7 @@
{{#each items}} -
{{avatar this imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
+
{{avatar this imageSize="tiny" extraClasses="actor" ignoreTitle="true"}}
{{/each}}
{{/each}}