External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-13 20:37:39 -02:30
Code Issues Packages Projects Releases Wiki Activity

store denormalized metadata about ActivityStream.actor for accounting

Browse Source 
see: https://github.com/ansible/tower/issues/1782
This commit is contained in:
Ryan Petrello
2018-05-21 16:16:18 -04:00
parent ffdd7f162b
commit f434196bae
5 changed files with 72 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/activity-stream/activitystream.controller.js
View File

@@ -53,8 +53,12 @@ export default ['$scope', '$state', 'subTitle', 'GetTargetTitle',
$scope.activities.forEach(function(activity, i) {
// build activity.user
if ($scope.activities[i].summary_fields.actor) {
$scope.activities[i].user = "<a href=\"/#/users/" + $scope.activities[i].summary_fields.actor.id + "\">" +
$scope.activities[i].summary_fields.actor.username + "</a>";
if ($scope.activities[i].summary_fields.actor.id) {
$scope.activities[i].user = "<a href=\"/#/users/" + $scope.activities[i].summary_fields.actor.id + "\">" +
$scope.activities[i].summary_fields.actor.username + "</a>";
} else {
$scope.activities[i].user = $scope.activities[i].summary_fields.actor.username + ' (deleted)';
}
} else {
$scope.activities[i].user = 'system';
}