From 6e0b9a2acb54df6bd90e554edbc9e44917d1bdff Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Tue, 2 Jul 2013 11:35:04 -0400 Subject: [PATCH] No longer replace event_display value with event_data.name value. --- awx/ui/static/js/controllers/JobEvents.js | 3 --- awx/ui/static/js/helpers/Children.js | 4 ---- awx/ui/static/lib/ansible/directives.js | 2 +- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/awx/ui/static/js/controllers/JobEvents.js b/awx/ui/static/js/controllers/JobEvents.js index f376f3f02a..4f75f04f76 100644 --- a/awx/ui/static/js/controllers/JobEvents.js +++ b/awx/ui/static/js/controllers/JobEvents.js @@ -48,9 +48,6 @@ function JobEventsList ($scope, $rootScope, $location, $log, $routeParams, Rest, set[i]['level'] = 0; set[i]['spaces'] = 0; 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'; cDate = new Date(set[i].created); diff --git a/awx/ui/static/js/helpers/Children.js b/awx/ui/static/js/helpers/Children.js index 70f6cd24e9..723a3aa5bc 100644 --- a/awx/ui/static/js/helpers/Children.js +++ b/awx/ui/static/js/helpers/Children.js @@ -59,10 +59,6 @@ angular.module('ChildrenHelper', ['RestServices', 'Utilities']) else { 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']) { // Display the actual result message data.results[j]['event_display'] = data.results[j]['event_data']['res']['msg']; diff --git a/awx/ui/static/lib/ansible/directives.js b/awx/ui/static/lib/ansible/directives.js index 4565f7f588..ee3cf01332 100644 --- a/awx/ui/static/lib/ansible/directives.js +++ b/awx/ui/static/lib/ansible/directives.js @@ -144,7 +144,7 @@ angular.module('AWDirectives', ['RestServices']) link: function(scope, elm, attrs, ctrl) { ctrl.$parsers.unshift( function(viewValue) { if (viewValue !== '') { - url = elm.attr('data-url'); + var url = elm.attr('data-url'); url = url.replace(/\:value/,escape(viewValue)); scope[elm.attr('data-source')] = null; Rest.setUrl(url);