From 440a6b122dc7c314a864b191dc654e008b56e4a4 Mon Sep 17 00:00:00 2001 From: chouseknecht Date: Tue, 15 Oct 2013 16:29:52 -0400 Subject: [PATCH] Fixed the launch from job template list to redirect to jobs page. --- awx/ui/static/js/helpers/JobSubmission.js | 4 +++- awx/ui/static/js/helpers/inventory.js | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js index 11cc8718d5..38c7d04e5a 100644 --- a/awx/ui/static/js/helpers/JobSubmission.js +++ b/awx/ui/static/js/helpers/JobSubmission.js @@ -24,6 +24,8 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential function navigate(canceled) { //Decide where to send the user once the modal dialog closes if (!canceled) { + console.log('here'); + console.log('base: ' + base); if (base == 'jobs') { scope.refreshJob(); } @@ -243,7 +245,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential scope.refresh(); } else { - $location.url('/#/jobs'); + $location.path('/jobs'); } }) .error( function(data, status, headers, config) { diff --git a/awx/ui/static/js/helpers/inventory.js b/awx/ui/static/js/helpers/inventory.js index 8ec127e0fc..bcde257c1a 100644 --- a/awx/ui/static/js/helpers/inventory.js +++ b/awx/ui/static/js/helpers/inventory.js @@ -570,6 +570,7 @@ angular.module('InventoryHelper', [ 'RestServices', 'Utilities', 'OrganizationLi Rest.get() .success( function(data, status, headers, config) { if (data.count == 0) { + console.log('emitted'); // no groups exist, show help scope.$emit('ShowHelp'); }