External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-19 05:31:22 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fixing job events pagination

Browse Source
This commit is contained in:
chouseknecht 2013-07-02 17:03:25 -04:00
parent b909e79088
commit 20266c3054
4 changed files with 45 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/static/css/ansible-ui.css
View File

@ -514,8 +514,10 @@
min-width: 200px;
}
.event-detail {
margin-top: 15px;
}
/* form displayed in modal window */
.horizontal-narrow .control-label {

34
awx/ui/static/js/helpers/Children.js
View File

@ -22,6 +22,35 @@ angular.module('ChildrenHelper', ['RestServices', 'Utilities'])
return lvl * 24;
}
function formatJSON(eventData) {
//turn JSON event data into an html form
var html = '';
if (eventData.res) {
var found = false;
for (var fld in eventData.res) {
if ( (fld == 'msg' || fld == 'stdout' || fld == 'stderr') &&
(eventData.res[fld] !== null && eventData.res[fld] !== '') ) {
html += "<label>";
switch(fld) {
case 'msg':
case 'stdout':
html += 'Output:';
break;
case 'stderr':
html += 'Error:';
break;
}
html += "</label>\n";
html += "<textarea readonly class=\"input-xxlarge\">" + eventData.res[fld] + "</textarea>\n";
found = true;
}
}
html = (found) ? "<form class=\"event-detail\">\n" + html + "</form>\n" : '';
}
html = (html == '' ) ? null : html;
return html;
}
// Scan the array list and find the clicked element
var clicked;
var found = false;
@ -58,8 +87,10 @@ angular.module('ChildrenHelper', ['RestServices', 'Utilities'])
}
else {
data.results[j]['class'] = 'childNode';
// For child nodes, include some of the even_data detail, but in a nicer non-JSONy format
data.results[j]['event_detail'] = formatJSON(data.results[j]['event_data']);
}
if (data.results[j]['event_data']['res'] && data.results[j]['event_data']['res']['msg']) {
/*if (data.results[j]['event_data']['res'] && data.results[j]['event_data']['res']['msg']) {
// Display the actual result message
data.results[j]['event_display'] = data.results[j]['event_data']['res']['msg'];
}
@ -73,6 +104,7 @@ angular.module('ChildrenHelper', ['RestServices', 'Utilities'])
data.results[j]['event_display'] += key + ": " + count + " ";
}
}
*/
if (clicked == (set.length - 1)) {
set.push(data.results[j]);
}

3
awx/ui/static/js/lists/JobEvents.js
View File

@ -41,7 +41,8 @@ angular.module('JobEventsListDefinition', [])
ngClick: "toggleChildren(\{\{ jobevent.id \}\}, '\{\{ jobevent.related.children \}\}')",
nosort: true,
searchable: false,
ngClass: '\{\{ jobevent.class \}\}'
ngClass: '\{\{ jobevent.class \}\}',
appendHTML: 'jobevent.event_detail'
},
host: {
label: 'Host',

6
awx/ui/static/lib/ansible/generator-helpers.js
View File

@ -147,6 +147,12 @@ angular.module('GeneratorHelpers', ['GeneratorHelpers'])
// close ngShow
html += (field.ngShow) ? "</span>" : "";
// Specific to Job Events page -showing event detail/results
html += (field.appendHTML) ? "<div ng-show=\"" + field.appendHTML + " !== null\" " +
"ng-bind-html-unsafe=\"" + field.appendHTML + "\" " +
"style=\"padding-left: \{\{ " + list.iterator + ".spaces + 12 \}\}px\" " +
"></div>\n" : "";
return html += "</td>\n";