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

Job detail page

Browse Source 
Fix for https://trello.com/c/uGFQjYn0/323-host-event-order-differs-between-host-events-list-and-host-event-dialog
This commit is contained in:
Chris Houseknecht
2014-08-19 16:09:50 -04:00
parent 3f54778111
commit bec9cc73cd
3 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -245,7 +245,7 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
if (play && task) { if (play && task) {
url = scope.job.related.job_events + '?parent=' + task.id + '&'; url = scope.job.related.job_events + '?parent=' + task.id + '&';
url += 'event__startswith=runner&page_size=' + scope.hostResultsMaxRows + '&order=host_name'; url += 'event__startswith=runner&page_size=' + scope.hostResultsMaxRows + '&order=host_name,counter';
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
@@ -309,6 +309,7 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
name: event.event_data.host, name: event.event_data.host,
created: event.created, created: event.created,
msg: msg, msg: msg,
counter: counter,
item: item item: item
}; };
} }

2
awx/ui/static/js/helpers/EventViewer.js
View File

@@ -254,7 +254,7 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo
}); });
url += (/\/$/.test(url)) ? '?' : '&'; url += (/\/$/.test(url)) ? '?' : '&';
url += (parent_id) ? 'parent=' + parent_id + '&page_size=50&order=host_name' : 'page_size=50&order=host_name'; url += (parent_id) ? 'parent=' + parent_id + '&page_size=50&order=host_name,counter' : 'page_size=50&order=host_name,counter';
GetEvent({ GetEvent({
url: url, url: url,

25
awx/ui/static/js/helpers/JobDetail.js
View File

@@ -97,6 +97,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
created: event.created, created: event.created,
modified: event.modified, modified: event.modified,
message: msg, message: msg,
counter: event.counter,
item: (event.event_data && event.event_data.res) ? event.event_data.res.item : '' item: (event.event_data && event.event_data.res) ? event.event_data.res.item : ''
}); });
break; break;
@@ -124,6 +125,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
created: event.created, created: event.created,
modified: event.modified, modified: event.modified,
message: msg, message: msg,
counter: event.counter,
item: (event.event_data && event.event_data.res) ? event.event_data.res.item : '' item: (event.event_data && event.event_data.res) ? event.event_data.res.item : ''
}); });
break; break;
@@ -141,6 +143,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
created: event.created, created: event.created,
modified: event.modified, modified: event.modified,
message: msg, message: msg,
counter: event.counter,
item: (event.event_data && event.event_data.res) ? event.event_data.res.item : '' item: (event.event_data && event.event_data.res) ? event.event_data.res.item : ''
}); });
break; break;
@@ -168,6 +171,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
created: event.created, created: event.created,
modified: event.modified, modified: event.modified,
message: msg, message: msg,
counter: event.counter,
item: (event.event_data && event.event_data.res) ? event.event_data.res.item : '' item: (event.event_data && event.event_data.res) ? event.event_data.res.item : ''
}); });
} }
@@ -481,6 +485,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
created = params.created, created = params.created,
msg = params.message, msg = params.message,
item = params.item, item = params.item,
counter = params.counter,
h, host; h, host;
/* /*
@@ -551,6 +556,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
status: status, status: status,
name: name, name: name,
created: created, created: created,
counter: counter,
message: msg, message: msg,
item: item item: item
}); });
@@ -566,6 +572,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
event_id = params.event_id, event_id = params.event_id,
status = params.status, status = params.status,
created = params.created, created = params.created,
counter = params.counter,
name = params.name, name = params.name,
msg = params.message, msg = params.message,
item = params.item, item = params.item,
@@ -610,6 +617,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
task_id: task_id, task_id: task_id,
name: name, name: name,
created: created, created: created,
counter: counter,
msg: msg, msg: msg,
item: item item: item
}; };
@@ -956,7 +964,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
url = scope.job.related.job_events + '?parent=' + scope.selectedTask + '&'; url = scope.job.related.job_events + '?parent=' + scope.selectedTask + '&';
url += (scope.search_host_name) ? 'host__name__icontains=' + scope.search_host_name + '&' : ''; url += (scope.search_host_name) ? 'host__name__icontains=' + scope.search_host_name + '&' : '';
url += (scope.search_host_status === 'failed') ? 'failed=true&' : ''; url += (scope.search_host_status === 'failed') ? 'failed=true&' : '';
url += 'event__startswith=runner&page_size=' + scope.hostResultsMaxRows + '&order=host_name'; url += 'event__startswith=runner&page_size=' + scope.hostResultsMaxRows + '&order=host_name,counter';
scope.hostResultsLoading = true; scope.hostResultsLoading = true;
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
@@ -1374,10 +1382,17 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
} }
keys = Object.keys(filteredListB); keys = Object.keys(filteredListB);
keys.sort(function compare(a, b) { keys.sort(function compare(a, b) {
if (filteredListB[a].name < filteredListB[b].name) if (filteredListB[a].name === filteredListB[b].name) {
return -1; if (filteredListB[a].counter < filteredListB[b].counter)
if (filteredListB[a].name > filteredListB[b].name) return -1;
return 1; if (filteredListB[a].counter >filteredListB[b].counter)
return 1;
} else {
if (filteredListB[a].name < filteredListB[b].name)
return -1;
if (filteredListB[a].name > filteredListB[b].name)
return 1;
}
// a must be equal to b // a must be equal to b
return 0; return 0;
}); });