External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-19 23:07:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5310 from mabashian/5278-activity-stream

Browse Source 
Update name/description whenever the activities array changes
This commit is contained in:
Michael Abashian
2017-02-13 09:40:10 -05:00
committed by GitHub
parent 69ab439d82 c59d82bd05
commit 02b0b97390
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
awx/ui/client/src/widgets/Stream.js
View File

@@ -283,18 +283,29 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
}); });
}; };
scope.activities.forEach(function(activity, i) { if(scope.activities && scope.activities.length > 0) {
// build activity.user buildUserAndDescription();
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>";
} else {
scope.activities[i].user = 'system';
}
// build description column / action text
BuildDescription(scope.activities[i]);
scope.$watch('activities', function(){
// Watch for future update to scope.activities (like page change, column sort, search, etc)
buildUserAndDescription();
}); });
function buildUserAndDescription(){
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>";
} else {
scope.activities[i].user = 'system';
}
// build description column / action text
BuildDescription(scope.activities[i]);
});
}
}; };
} }
]); ]);