External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-21 10:57:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

Job detail page refactoration

Browse Source 
Changed references to host__name to host_name in queries to job_host_summaries.
This commit is contained in:
Chris Houseknecht
2014-07-14 15:45:05 -04:00
parent b4904a4065
commit ef9c292df9
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,7 +141,7 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
} }
scope.removeHostSummaries = scope.$on('LoadHostSummaries', function() { scope.removeHostSummaries = scope.$on('LoadHostSummaries', function() {
var url = scope.job.related.job_host_summaries + '?'; var url = scope.job.related.job_host_summaries + '?';
url += '&page_size=' + scope.hostSummariesMaxRows + '&order_by=host__name'; url += '&page_size=' + scope.hostSummariesMaxRows + '&order_by=host_name';
scope.jobData.hostSummaries = {}; scope.jobData.hostSummaries = {};
@@ -1055,9 +1055,9 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar
// check for more hosts when user scrolls to bottom of host summaries list... // check for more hosts when user scrolls to bottom of host summaries list...
if ((!scope.liveEventProcessing) && scope.hosts) { if ((!scope.liveEventProcessing) && scope.hosts) {
var url = GetBasePath('jobs') + job_id + '/job_host_summaries/?'; var url = GetBasePath('jobs') + job_id + '/job_host_summaries/?';
url += (scope.search_host_summary_name) ? 'host__name__icontains=' + scope.search_host_summary_name + '&' : ''; url += (scope.search_host_summary_name) ? 'host_name__icontains=' + scope.search_host_summary_name + '&' : '';
url += (scope.search_host_summary_status === 'failed') ? 'failed=true&' : ''; url += (scope.search_host_summary_status === 'failed') ? 'failed=true&' : '';
url += 'host__name__gt=' + scope.hosts[scope.hosts.length - 1].name + '&page_size=' + scope.hostSummariesMaxRows + '&order_by=host__name'; url += 'host_name__gt=' + scope.hosts[scope.hosts.length - 1].name + '&page_size=' + scope.hostSummariesMaxRows + '&order_by=host_name';
$('#hostSummariesMoreRows').fadeIn(); $('#hostSummariesMoreRows').fadeIn();
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()

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

@@ -948,9 +948,9 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
url; url;
url = scope.job.related.job_host_summaries + '?'; 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_name) ? 'host_name__icontains=' + scope.search_host_summary_name + '&': '';
url += (scope.search_host_summary_status === 'failed') ? 'failed=true&' : ''; url += (scope.search_host_summary_status === 'failed') ? 'failed=true&' : '';
url += '&page_size=' + scope.hostSummariesMaxRows + '&order_by=host__name'; url += '&page_size=' + scope.hostSummariesMaxRows + '&order_by=host_name';
scope.hosts = []; scope.hosts = [];