From fc72a662b5764f34f748a4d44e7bc33a4087323b Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Thu, 19 Mar 2015 13:10:45 -0400 Subject: [PATCH] Fix hanging 'Wait' message when JT form times out --- awx/ui/static/js/helpers/JobTemplates.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/awx/ui/static/js/helpers/JobTemplates.js b/awx/ui/static/js/helpers/JobTemplates.js index 1955188f2f..5e55668282 100644 --- a/awx/ui/static/js/helpers/JobTemplates.js +++ b/awx/ui/static/js/helpers/JobTemplates.js @@ -21,9 +21,9 @@ angular.module('JobTemplatesHelper', ['Utilities']) */ .factory('CallbackHelpInit', ['$location', 'GetBasePath', 'Rest', 'JobTemplateForm', 'GenerateForm', '$routeParams', 'LoadBreadCrumbs', 'ProcessErrors', 'ParseTypeChange', - 'ParseVariableString', 'Empty', 'LookUpInit', 'InventoryList', 'CredentialList','ProjectList', 'RelatedSearchInit', 'RelatedPaginateInit', + 'ParseVariableString', 'Empty', 'LookUpInit', 'InventoryList', 'CredentialList','ProjectList', 'RelatedSearchInit', 'RelatedPaginateInit', 'Wait', function($location, GetBasePath, Rest, JobTemplateForm, GenerateForm, $routeParams, LoadBreadCrumbs, ProcessErrors,ParseTypeChange, - ParseVariableString, Empty, LookUpInit, InventoryList, CredentialList, ProjectList, RelatedSearchInit, RelatedPaginateInit) { + ParseVariableString, Empty, LookUpInit, InventoryList, CredentialList, ProjectList, RelatedSearchInit, RelatedPaginateInit, Wait) { return function(params) { var scope = params.scope, @@ -122,7 +122,7 @@ angular.module('JobTemplatesHelper', ['Utilities']) scope[form.fields[fld].sourceModel + '_' + form.fields[fld].sourceField]; } } - + Wait('stop'); scope.url = data.url; scope.ask_variables_on_launch = (data.ask_variables_on_launch) ? 'true' : 'false'; @@ -197,4 +197,3 @@ angular.module('JobTemplatesHelper', ['Utilities']) }]); -