External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-15 18:20:00 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1906 from ryanpetrello/delete-user-activity-stream

Browse Source 
store metadata about ActivityStream.actor when the User is deleted
This commit is contained in:
Ryan Petrello
2018-05-23 10:15:01 -04:00
committed by GitHub
parent 966464623a f434196bae
commit 8bbc36336e
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';
}