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

No longer replace event_display value with event_data.name value.

Browse Source
This commit is contained in:
chouseknecht
2013-07-02 11:35:04 -04:00
parent 78eac4834e
commit 6e0b9a2acb
3 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,9 +48,6 @@ function JobEventsList ($scope, $rootScope, $location, $log, $routeParams, Rest,
set[i]['level'] = 0; set[i]['level'] = 0;
set[i]['spaces'] = 0; set[i]['spaces'] = 0;
set[i]['class'] = 'parentNode'; set[i]['class'] = 'parentNode';
if (set[i]['event_data']['name']) {
set[i]['event_display'] = set[i]['event_data']['name'];
}
} }
scope.jobevents[i].status = (scope.jobevents[i].failed) ? 'error' : 'success'; scope.jobevents[i].status = (scope.jobevents[i].failed) ? 'error' : 'success';
cDate = new Date(set[i].created); cDate = new Date(set[i].created);

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

@@ -59,10 +59,6 @@ angular.module('ChildrenHelper', ['RestServices', 'Utilities'])
else { else {
data.results[j]['class'] = 'childNode'; data.results[j]['class'] = 'childNode';
} }
if (data.results[j]['event_data']['name']) {
// Display the actual task name
data.results[j]['event_display'] = data.results[j]['event_data']['name'];
}
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 // Display the actual result message
data.results[j]['event_display'] = data.results[j]['event_data']['res']['msg']; data.results[j]['event_display'] = data.results[j]['event_data']['res']['msg'];

2
awx/ui/static/lib/ansible/directives.js
View File

@@ -144,7 +144,7 @@ angular.module('AWDirectives', ['RestServices'])
link: function(scope, elm, attrs, ctrl) { link: function(scope, elm, attrs, ctrl) {
ctrl.$parsers.unshift( function(viewValue) { ctrl.$parsers.unshift( function(viewValue) {
if (viewValue !== '') { if (viewValue !== '') {
url = elm.attr('data-url'); var url = elm.attr('data-url');
url = url.replace(/\:value/,escape(viewValue)); url = url.replace(/\:value/,escape(viewValue));
scope[elm.attr('data-source')] = null; scope[elm.attr('data-source')] = null;
Rest.setUrl(url); Rest.setUrl(url);