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

Job detail page

Browse Source 
Fixed Host Events sort to always sort by ascending host name, matching the event viewer dialog. 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 12:56:17 -04:00
parent 6b8acae8b7
commit e605a89a80
3 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,7 +187,7 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
}
scope.removeHostSummaries = scope.$on('LoadHostSummaries', function() {
var url = scope.job.related.job_host_summaries + '?';
url += '&page_size=' + scope.hostSummariesMaxRows + '&order_by=host_name';
url += '&page_size=' + scope.hostSummariesMaxRows + '&order=host_name';
scope.jobData.hostSummaries = {};
@ -233,7 +233,7 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
if (play && task) {
url = scope.job.related.job_events + '?parent=' + task.id + '&';
url += 'event__startswith=runner&page_size=' + scope.hostResultsMaxRows + '&order_by=-host__name';
url += 'event__startswith=runner&page_size=' + scope.hostResultsMaxRows + '&order=host_name';
Rest.setUrl(url);
Rest.get()
@ -324,7 +324,7 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
if (play) {
url = scope.job.url + 'job_tasks/?event_id=' + play.id;
url += '&page_size=' + scope.tasksMaxRows + '&order_by=id';
url += '&page_size=' + scope.tasksMaxRows + '&order=id';
Rest.setUrl(url);
Rest.get()

4
awx/ui/static/js/controllers/Sockets.js
View File

@ -99,6 +99,10 @@ function SocketsController ($scope, $compile, ClearScope, Socket) {
jobs_scope.messages.push(data);
});
jobs_socket.on("summary_complete", function(data) {
jobs_scope.messages.push(data);
});
job_events_scope.jobs_list = [];
job_events_scope.subscribeToJobEvent = function() {

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

@ -705,7 +705,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
scope.plays = [];
url = scope.job.url + 'job_plays/?page_size=' + scope.playsMaxRows + '&order_by=id';
url = scope.job.url + 'job_plays/?page_size=' + scope.playsMaxRows + '&order=id';
url += (scope.search_play_name) ? '&play__icontains=' + scope.search_play_name : '';
url += (scope.search_play_status === 'failed') ? '&failed=true' : '';
scope.playsLoading = true;
@ -808,7 +808,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
url = scope.job.url + 'job_tasks/?event_id=' + scope.selectedPlay;
url += (scope.search_task_name) ? '&task__icontains=' + scope.search_task_name : '';
url += (scope.search_task_status === 'failed') ? '&failed=true' : '';
url += '&page_size=' + scope.tasksMaxRows + '&order_by=id';
url += '&page_size=' + scope.tasksMaxRows + '&order=id';
scope.plays.every(function(p, idx) {
if (p.id === scope.selectedPlay) {
@ -956,7 +956,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
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_status === 'failed') ? 'failed=true&' : '';
url += 'event__startswith=runner&page_size=' + scope.hostResultsMaxRows + '&order_by=host__name';
url += 'event__startswith=runner&page_size=' + scope.hostResultsMaxRows + '&order=host_name';
scope.hostResultsLoading = true;
Rest.setUrl(url);
Rest.get()
@ -1053,7 +1053,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
url = scope.job.related.job_host_summaries + '?';
url += (scope.search_host_summary_name) ? 'host_name__icontains=' + scope.search_host_summary_name + '&': '';
url += (scope.search_host_summary_status === 'failed') ? 'failed=true&' : '';
url += '&page_size=' + scope.hostSummariesMaxRows + '&order_by=host_name';
url += '&page_size=' + scope.hostSummariesMaxRows + '&order=host_name';
scope.hosts = [];
scope.hostSummariesLoading = true;
@ -1372,18 +1372,17 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
else {
filteredListB = filteredListA;
}
keys = Object.keys(filteredListB);
keys.sort(function(a,b) {
if (filteredListB[a].name + filteredListB[a].item > filteredListB[b].name + filteredListB[b].item)
keys.sort(function compare(a, b) {
if (filteredListB[a].name < filteredListB[b].name)
return -1;
if (filteredListB[a].name + filteredListB[a].item < filteredListB[b].name + filteredListB[b].item)
if (filteredListB[a].name > filteredListB[b].name)
return 1;
// a must be equal to b
return 0;
});
while (idx < keys.length && result.length < scope.hostResultsMaxRows) {
result.unshift(filteredListB[keys[idx]]);
result.push(filteredListB[keys[idx]]);
idx++;
}
}