Added onExit functions to routes where the job launch and survey maker modals may be displayed. This will handle cleaning up the modal properly so that it can be re-opened

awx/ui/client/src/app.js

@@ -255,6 +255,16 @@ var tower = angular.module('Tower', [
                             });
                         });
                     }]
+                },
+                onExit: function(){
+                    // close the job launch modal
+                    // using an onExit event to handle cases where the user navs away using the url bar / back and not modal "X"
+                    // Destroy the dialog
+                    if($("#job-launch-modal").hasClass('ui-dialog-content')) {
+                        $('#job-launch-modal').dialog('destroy');
+                    }
+                    // Remove the directive from the page (if it's there)
+                    $('#content-container').find('submit-job').remove();
                 }
             }).
 
@@ -264,6 +274,16 @@ var tower = angular.module('Tower', [
                 controller: JobsListController,
                 ncyBreadcrumb: {
                     label: "JOBS"
+                },
+                onExit: function(){
+                    // close the job launch modal
+                    // using an onExit event to handle cases where the user navs away using the url bar / back and not modal "X"
+                    // Destroy the dialog
+                    if($("#job-launch-modal").hasClass('ui-dialog-content')) {
+                        $('#job-launch-modal').dialog('destroy');
+                    }
+                    // Remove the directive from the page (if it's there)
+                    $('#content-container').find('submit-job').remove();
                 }
             }).
 

awx/ui/client/src/job-detail/host-summary/host-summary.route.js

@@ -17,5 +17,15 @@ export default {
     },
     ncyBreadcrumb: {
         skip: true // Never display this state in breadcrumb.
+    },
+    onExit: function(){
+        // close the job launch modal
+        // using an onExit event to handle cases where the user navs away using the url bar / back and not modal "X"
+        // Destroy the dialog
+        if($("#job-launch-modal").hasClass('ui-dialog-content')) {
+            $('#job-launch-modal').dialog('destroy');
+        }
+        // Remove the directive from the page (if it's there)
+        $('#content-container').find('submit-job').remove();
     }
 };

awx/ui/client/src/job-detail/job-detail.route.js

@@ -30,5 +30,15 @@ export default {
         }]
     },
     templateUrl: templateUrl('job-detail/job-detail'),
-    controller: 'JobDetailController'
+    controller: 'JobDetailController',
+    onExit: function(){
+        // close the job launch modal
+        // using an onExit event to handle cases where the user navs away using the url bar / back and not modal "X"
+        // Destroy the dialog
+        if($("#job-launch-modal").hasClass('ui-dialog-content')) {
+            $('#job-launch-modal').dialog('destroy');
+        }
+        // Remove the directive from the page (if it's there)
+        $('#content-container').find('submit-job').remove();
+    }
 };

awx/ui/client/src/job-templates/add/job-templates-add.route.js

@@ -14,5 +14,19 @@ export default {
     ncyBreadcrumb: {
         parent: "jobTemplates",
         label: "CREATE JOB TEMPLATE"
+    },
+    onExit: function(){
+        // close the job launch modal
+        // using an onExit event to handle cases where the user navs away using the url bar / back and not modal "X"
+        // Destroy the dialog
+        if($("#job-launch-modal").hasClass('ui-dialog-content')) {
+            $('#job-launch-modal').dialog('destroy');
+        }
+        // Remove the directive from the page (if it's there)
+        $('#content-container').find('submit-job').remove();
+
+        if($("#survey-modal-dialog").hasClass('ui-dialog-content')) {
+            $('#survey-modal-dialog').dialog('destroy');
+        }
     }
 };

awx/ui/client/src/job-templates/edit/job-templates-edit.route.js

@@ -17,5 +17,19 @@ export default {
     ncyBreadcrumb: {
         parent: 'jobTemplates',
         label: "{{name}}"
+    },
+    onExit: function(){
+        // close the job launch modal
+        // using an onExit event to handle cases where the user navs away using the url bar / back and not modal "X"
+        // Destroy the dialog
+        if($("#job-launch-modal").hasClass('ui-dialog-content')) {
+            $('#job-launch-modal').dialog('destroy');
+        }
+        // Remove the directive from the page (if it's there)
+        $('#content-container').find('submit-job').remove();
+
+        if($("#survey-modal-dialog").hasClass('ui-dialog-content')) {
+            $('#survey-modal-dialog').dialog('destroy');
+        }
     }
 };

awx/ui/client/src/job-templates/list/job-templates-list.route.js

@@ -17,5 +17,15 @@ export default {
     },
     ncyBreadcrumb: {
         label: "JOB TEMPLATES"
+    },
+    onExit: function(){
+        // close the job launch modal
+        // using an onExit event to handle cases where the user navs away using the url bar / back and not modal "X"
+        // Destroy the dialog
+        if($("#job-launch-modal").hasClass('ui-dialog-content')) {
+            $('#job-launch-modal').dialog('destroy');
+        }
+        // Remove the directive from the page (if it's there)
+        $('#content-container').find('submit-job').remove();
     }
 };

awx/ui/client/src/organizations/linkout/organizations-linkout.route.js

@@ -121,6 +121,16 @@ export default [
             features: ['FeaturesService', function(FeaturesService) {
                 return FeaturesService.get();
             }]
+        },
+        onExit: function(){
+            // close the job launch modal
+            // using an onExit event to handle cases where the user navs away using the url bar / back and not modal "X"
+            // Destroy the dialog
+            if($("#job-launch-modal").hasClass('ui-dialog-content')) {
+                $('#job-launch-modal').dialog('destroy');
+            }
+            // Remove the directive from the page (if it's there)
+            $('#content-container').find('submit-job').remove();
         }
     },
     {

awx/ui/client/src/portal-mode/portal-mode.route.js

@@ -24,5 +24,15 @@ export default {
             templateUrl: templateUrl('portal-mode/portal-mode-jobs'),
             controller: PortalModeJobsController
         }
+    },
+    onExit: function(){
+        // close the job launch modal
+        // using an onExit event to handle cases where the user navs away using the url bar / back and not modal "X"
+        // Destroy the dialog
+        if($("#job-launch-modal").hasClass('ui-dialog-content')) {
+            $('#job-launch-modal').dialog('destroy');
+        }
+        // Remove the directive from the page (if it's there)
+        $('#content-container').find('submit-job').remove();
     }
 };