From ef9c292df991273b385821dcd2ed6017741a64d7 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Mon, 14 Jul 2014 15:45:05 -0400 Subject: [PATCH] Job detail page refactoration Changed references to host__name to host_name in queries to job_host_summaries. --- awx/ui/static/js/controllers/JobDetail.js | 6 +++--- awx/ui/static/js/helpers/JobDetail.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js index 04f6086b45..2709cd64bc 100644 --- a/awx/ui/static/js/controllers/JobDetail.js +++ b/awx/ui/static/js/controllers/JobDetail.js @@ -141,7 +141,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_by=host_name'; 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... if ((!scope.liveEventProcessing) && scope.hosts) { 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 += '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(); Rest.setUrl(url); Rest.get() diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js index 446df9f0e0..0b4c325a9a 100644 --- a/awx/ui/static/js/helpers/JobDetail.js +++ b/awx/ui/static/js/helpers/JobDetail.js @@ -948,9 +948,9 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge url; 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 += '&page_size=' + scope.hostSummariesMaxRows + '&order_by=host__name'; + url += '&page_size=' + scope.hostSummariesMaxRows + '&order_by=host_name'; scope.hosts = [];