External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 21:49:27 -02:30
Code Issues Packages Projects Releases Wiki Activity

Activity Stream: clicking view detail no longer re-stringifies the changes JSON.

Browse Source
This commit is contained in:
chris Houseknecht
2014-01-20 13:50:30 -05:00
parent 8f5642e13e
commit e5d148ac18
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -181,15 +181,15 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
if (activity) { if (activity) {
// Setup changes field // Setup changes field
activity['changes'] = JSON.stringify(activity['changes'], null, '\t'); activity['changes_stringified'] = JSON.stringify(activity['changes'], null, '\t');
var n = activity['changes'].match(/\n/g); var n = activity['changes_stringified'].match(/\n/g);
var rows = (n) ? n.length : 1; var rows = (n) ? n.length : 1;
rows = (rows < 1) ? 3 : 10; rows = (rows < 1) ? 3 : 10;
form.fields['changes'].rows = 10; form.fields['changes'].rows = 10;
// Load the form // Load the form
var scope = generator.inject(form, { mode: 'edit', modal: true, related: false }); var scope = generator.inject(form, { mode: 'edit', modal: true, related: false });
scope['changes'] = activity['changes']; scope['changes'] = activity['changes_stringified'];
scope['user'] = ( (activity.summary_fields.actor) ? activity.summary_fields.actor.username : 'system' ) + scope['user'] = ( (activity.summary_fields.actor) ? activity.summary_fields.actor.username : 'system' ) +
' on ' + FormatDate(new Date(activity['timestamp'])); ' on ' + FormatDate(new Date(activity['timestamp']));
scope['operation'] = activity['description_nolink']; scope['operation'] = activity['description_nolink'];
@@ -265,7 +265,7 @@ angular.module('StreamWidget', ['RestServices', 'Utilities', 'StreamListDefiniti
} }
} }
} }
// Add a container for the stream widget // Add a container for the stream widget
$('#tab-content-container').append('<div id="stream-container"><div id=\"stream-content\"></div></div><!-- Stream widget -->'); $('#tab-content-container').append('<div id="stream-container"><div id=\"stream-content\"></div></div><!-- Stream widget -->');