From 956dfedb30b4bccacd2d362fa3099fbfaec000d2 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 16 Dec 2014 13:48:15 -0500 Subject: [PATCH] Job detail job events The job events modal was not being loaded because the data call to the API was not specifying which page of data to request. --- awx/ui/static/js/controllers/JobDetail.js | 1 + awx/ui/static/js/helpers/EventViewer.js | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js index aeccdc4052..d1f22248ed 100644 --- a/awx/ui/static/js/controllers/JobDetail.js +++ b/awx/ui/static/js/controllers/JobDetail.js @@ -1004,6 +1004,7 @@ function JobDetailController ($location, $rootScope, $scope, $compile, $routePar url: scope.job.related.job_events, parent_id: scope.selectedTask, event_id: id, + index: this.$index, title: 'Host Event' }); }; diff --git a/awx/ui/static/js/helpers/EventViewer.js b/awx/ui/static/js/helpers/EventViewer.js index 1da9efe16d..e316bcd6b3 100644 --- a/awx/ui/static/js/helpers/EventViewer.js +++ b/awx/ui/static/js/helpers/EventViewer.js @@ -22,6 +22,8 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo parent_id = params.parent_id, title = params.title, //optional scope = parent_scope.$new(true), + index = params.index, + page, current_event; if (scope.removeShowNextEvent) { @@ -257,8 +259,9 @@ angular.module('EventViewerHelper', ['ModalDialog', 'Utilities', 'EventsViewerFo }); }); + page = (index) ? Math.ceil((index+1)/50) : 1; url += (/\/$/.test(url)) ? '?' : '&'; - url += (parent_id) ? 'parent=' + parent_id + '&page_size=50&order=host_name,counter' : 'page_size=50&order=host_name,counter'; + url += (parent_id) ? 'page='+page +'&parent=' + parent_id + '&page_size=50&order=host_name,counter' : 'page_size=50&order=host_name,counter'; GetEvent({ url: url,