Merge pull request #1586 from opf/fix/activities-missing-user-names

brought user activity template in line with api.
opf · Jul 10, 2014 · 30aa1f4 · 30aa1f4
2 parents c9767d6 + 88b7a78
commit 30aa1f4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 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
@@ -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
@@ -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"