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

Job detail page refactorating

Browse Source 
Switched endless scroll paging to use next URL provided by API. Since the event host_name might be the same for all host events, attempting to use __gt doesn't work reliably anyway, and it turns out there's no need to rebuild the URL on the scroll down event. Now sorting host results by host_name + item to cover cases where host_name is always the same.
This commit is contained in:
Chris Houseknecht
2014-07-15 17:11:35 -04:00
parent 49bb4c567f
commit 7e538ffcc2
2 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -669,6 +669,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
Rest.setUrl(url);
Rest.get()
.success(function(data) {
scope.next_plays = data.next;
data.results.forEach(function(event, idx) {
var status, status_text, start, end, elapsed;
@@ -776,6 +777,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
Rest.setUrl(url);
Rest.get()
.success(function(data) {
scope.next_tasks = data.next;
data.results.forEach(function(event, idx) {
var end, elapsed, status, status_text;
@@ -908,9 +910,11 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
url += (scope.search_host_name) ? 'host__name__icontains=' + scope.search_host_name + '&' : '';
url += (scope.search_host_status === 'failed') ? 'failed=true&' : '';
url += 'event__icontains=runner&page_size=' + scope.hostResultsMaxRows + '&order_by=host__name';
Rest.setUrl(url);
Rest.get()
.success(function(data) {
scope.next_host_results = data.next;
data.results.forEach(function(event) {
var status, status_text, item;
if (event.event === "runner_on_skipped") {
@@ -996,6 +1000,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
Rest.setUrl(url);
Rest.get()
.success(function(data) {
scope.next_host_summaries = data.next;
data.results.forEach(function(event) {
var name;
if (event.host_name) {
@@ -1288,9 +1293,9 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
keys = Object.keys(filteredListB);
keys.sort(function(a,b) {
if (filteredListB[a].name > filteredListB[b].name)
if (filteredListB[a].name + filteredListB[a].item > filteredListB[b].name + filteredListB[b].item)
return -1;
if (filteredListB[a].name < filteredListB[b].name)
if (filteredListB[a].name + filteredListB[a].item < filteredListB[b].name + filteredListB[b].item)
return 1;
// a must be equal to b
return 0;