From 88b7a78837eba030b2a5a2c8f8e6c720773e6506 Mon Sep 17 00:00:00 2001
From: Richard <rm.sylvester@gmail.com>
Date: Thu, 10 Jul 2014 14:40:17 +0200
Subject: [PATCH] brought user activity template in line with api (AGAIN FFS).

---
 .../angular/work_packages/tabs/user-activity-directive.js       | 2 ++
 public/templates/work_packages/tabs/_user_activity.html         | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/angular/work_packages/tabs/user-activity-directive.js b/app/assets/javascripts/angular/work_packages/tabs/user-activity-directive.js
index 97b125c30cda..4e464cbf2743 100644
--- a/app/assets/javascripts/angular/work_packages/tabs/user-activity-directive.js
+++ b/app/assets/javascripts/angular/work_packages/tabs/user-activity-directive.js
@@ -42,6 +42,8 @@ angular.module('openproject.workPackages.tabs')
       scope.userPath = PathHelper.staticUserPath;
 
       scope.activity.links.user.fetch().then(function(user) {
+        scope.userId = user.props.id;
+        scope.userName = user.props.firstName + ' ' + user.props.lastName;
         scope.userAvatar = user.props.avatar;
       });
     }
diff --git a/public/templates/work_packages/tabs/_user_activity.html b/public/templates/work_packages/tabs/_user_activity.html
index d8aa2f47e28c..63a6565201ea 100644
--- a/public/templates/work_packages/tabs/_user_activity.html
+++ b/public/templates/work_packages/tabs/_user_activity.html
@@ -2,7 +2,7 @@
   <div class="comments-number"><a ng-href="#{{ currentAnchor }}" ng-bind="'#' + activityNo"></a>
   </div>
   <img class="avatar" ng-src="{{ userAvatar }}" />
-  <span class="user"><a ng-href="{{ userPath(activity.props.userId) }}" name="{{ currentAnchor }}" ng-bind="activity.props.userName"></a></span>
+  <span class="user"><a ng-href="{{ userPath(userId) }}" name="{{ currentAnchor }}" ng-bind="userName"></a></span>
   <span class="date">commented on <span ng-bind="activity.props.createdAt | date:'short'"/></span>
   <span class="comment">
     <span class="message" ng-show="activity.props._type == 'Activity::Comment'">{{ activity.props.comment }}</span>