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

fixing merge conflicts

Browse Source 
from master
This commit is contained in:
Jared Tabor
2015-05-15 17:18:14 -04:00
parent 89a4e43cd0
commit 2b7a2a1a3b
22 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/widgets/Stream.js
View File

@@ -300,7 +300,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
scope = generator.inject(form, { mode: 'edit', modal: true, related: false });
scope.changes = activity.changes_stringified;
scope.user = ((activity.summary_fields.actor) ? activity.summary_fields.actor.username : 'system') +
' on ' + $filter('date')(activity.timestamp, "MM/dd/yy HH:mm:ss");
' on ' + $filter('longDate')(activity.timestamp);
scope.operation = activity.description_nolink;
scope.formModalAction = function () {