From 1ad1e63f5e69815ed7416c70dd0b9ef6d24d969a Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Mon, 1 Jun 2015 17:16:39 -0400 Subject: [PATCH] Related schedule and Completed jobs on job template form page the schedules and completed jobs lists were not being filled with related data on the job templates form page. --- awx/ui/static/js/controllers/JobTemplates.js | 8 ++++++-- awx/ui/static/js/helpers/JobTemplates.js | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/awx/ui/static/js/controllers/JobTemplates.js b/awx/ui/static/js/controllers/JobTemplates.js index d4316a6c56..99c72cb0ae 100644 --- a/awx/ui/static/js/controllers/JobTemplates.js +++ b/awx/ui/static/js/controllers/JobTemplates.js @@ -886,11 +886,15 @@ export function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log, if ($scope.jobTemplateLoadedRemove) { $scope.jobTemplateLoadedRemove(); } - $scope.jobTemplateLoadedRemove = $scope.$on('jobTemplateLoaded', function (e, related_cloud_credential, masterObject) { - var dft; + $scope.jobTemplateLoadedRemove = $scope.$on('jobTemplateLoaded', function (e, related_cloud_credential, masterObject, relatedSets) { + var dft, set; master = masterObject; getPlaybooks($scope.project); + for (set in relatedSets) { + $scope.search(relatedSets[set].iterator); + } + dft = ($scope.host_config_key === "" || $scope.host_config_key === null) ? 'false' : 'true'; md5Setup({ scope: $scope, diff --git a/awx/ui/static/js/helpers/JobTemplates.js b/awx/ui/static/js/helpers/JobTemplates.js index 0e83ef0ac1..f5d59c419b 100644 --- a/awx/ui/static/js/helpers/JobTemplates.js +++ b/awx/ui/static/js/helpers/JobTemplates.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name helpers.function:JobTemplatesHelper @@ -187,7 +187,7 @@ angular.module('JobTemplatesHelper', ['Utilities']) relatedSets: relatedSets }); - scope.$emit('jobTemplateLoaded', data.related.cloud_credential, master); + scope.$emit('jobTemplateLoaded', data.related.cloud_credential, master, relatedSets); }) .error(function (data, status) { ProcessErrors(scope, data, status, form, {