Merge pull request #6715 from mabashian/remove-clearscope

Removed ClearScope service in favor of logic in stateChangeStart

awx/ui/client/src/app.js

@@ -203,12 +203,12 @@ var tower = angular.module('Tower', [
     ])
     .run(['$stateExtender', '$q', '$compile', '$cookies', '$rootScope', '$log', '$stateParams',
         'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer',
-        'ClearScope', 'LoadConfig', 'Store', 'pendoService', 'Prompt', 'Rest',
+        'LoadConfig', 'Store', 'pendoService', 'Prompt', 'Rest',
         'Wait', 'ProcessErrors', '$state', 'GetBasePath', 'ConfigService',
         'FeaturesService', '$filter', 'SocketService',
         function($stateExtender, $q, $compile, $cookies, $rootScope, $log, $stateParams,
             CheckLicense, $location, Authorization, LoadBasePaths, Timer,
-            ClearScope, LoadConfig, Store, pendoService, Prompt, Rest, Wait,
+            LoadConfig, Store, pendoService, Prompt, Rest, Wait,
             ProcessErrors, $state, GetBasePath, ConfigService, FeaturesService,
             $filter, SocketService) {
 
@@ -305,6 +305,28 @@ var tower = angular.module('Tower', [
                         window.clearInterval($rootScope.jobStdOutInterval);
                     }
 
+                    $rootScope.flashMessage = null;
+
+                    $('#form-modal2 .modal-body').empty();
+
+                    $('.tooltip').each(function() {
+                        $(this).remove();
+                    });
+
+                    $('.popover').each(function() {
+                        $(this).remove();
+                    });
+
+                    $('.ui-dialog-content').each(function() {
+                        $(this).dialog('close');
+                    });
+
+                    try {
+                        $('#help-modal').dialog('close');
+                    } catch (e) {
+                        // ignore
+                    }
+
                     // On each navigation request, check that the user is logged in
                     if (!/^\/(login|logout)/.test($location.path())) {
                         // capture most recent URL, excluding login/logout

awx/ui/client/src/configuration/configuration.controller.js

@@ -5,7 +5,7 @@
  *************************************************/
 
 export default [
-    '$scope', '$rootScope', '$state', '$stateParams', '$timeout', '$q', 'Alert', 'ClearScope',
+    '$scope', '$rootScope', '$state', '$stateParams', '$timeout', '$q', 'Alert',
     'ConfigurationService', 'ConfigurationUtils', 'CreateDialog', 'CreateSelect2', 'i18n', 'ParseTypeChange', 'ProcessErrors', 'Store',
     'Wait', 'configDataResolve', 'ToJSON',
     //Form definitions
@@ -24,7 +24,7 @@ export default [
     'ConfigurationJobsForm',
     'ConfigurationUiForm',
     function(
-        $scope, $rootScope, $state, $stateParams, $timeout, $q, Alert, ClearScope,
+        $scope, $rootScope, $state, $stateParams, $timeout, $q, Alert,
         ConfigurationService, ConfigurationUtils, CreateDialog, CreateSelect2, i18n, ParseTypeChange, ProcessErrors, Store,
         Wait, configDataResolve, ToJSON,
         //Form definitions

awx/ui/client/src/credentials/list/credentials-list.controller.js

@@ -4,14 +4,12 @@
  * All Rights Reserved
  *************************************************/
 
-export default ['$scope', 'Rest', 'CredentialList', 'Prompt', 'ClearScope',
+export default ['$scope', 'Rest', 'CredentialList', 'Prompt',
     'ProcessErrors', 'GetBasePath', 'Wait', '$state', '$filter', 'rbacUiControlService', 'Dataset', 'i18n',
-    function($scope, Rest, CredentialList, Prompt, ClearScope,
+    function($scope, Rest, CredentialList, Prompt,
     ProcessErrors, GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset,
     i18n) {
 
-        ClearScope();
-
         var list = CredentialList,
             defaultUrl = GetBasePath('credentials');
 

awx/ui/client/src/home/home.controller.js

@@ -5,11 +5,9 @@
  *************************************************/
 
 export default ['$scope', '$rootScope','Wait',
-    'ClearScope', 'Rest', 'GetBasePath', 'ProcessErrors', 'graphData',
+    'Rest', 'GetBasePath', 'ProcessErrors', 'graphData',
     function($scope, $rootScope, Wait,
-    ClearScope, Rest, GetBasePath, ProcessErrors, graphData) {
+    Rest, GetBasePath, ProcessErrors, graphData) {
-
-        ClearScope('home');
 
         var dataCount = 0;
 

awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc.controller.js

@@ -11,11 +11,9 @@
 */
 function adhocController($q, $scope, $stateParams,
     $state, CheckPasswords, PromptForPasswords, CreateLaunchDialog, CreateSelect2, adhocForm,
-    GenerateForm, Rest, ProcessErrors, ClearScope, GetBasePath, GetChoices,
+    GenerateForm, Rest, ProcessErrors, GetBasePath, GetChoices,
     KindChange, Wait, ParseTypeChange) {
 
-    ClearScope();
-
     // this is done so that we can access private functions for testing, but
     // we don't want to populate the "public" scope with these internal
     // functions
@@ -302,6 +300,6 @@ function adhocController($q, $scope, $stateParams,
 
 export default ['$q', '$scope', '$stateParams',
     '$state', 'CheckPasswords', 'PromptForPasswords', 'CreateLaunchDialog', 'CreateSelect2',
-     'adhocForm', 'GenerateForm', 'Rest', 'ProcessErrors', 'ClearScope', 'GetBasePath',
+     'adhocForm', 'GenerateForm', 'Rest', 'ProcessErrors', 'GetBasePath',
     'GetChoices', 'KindChange', 'Wait', 'ParseTypeChange',
     adhocController];

awx/ui/client/src/inventories-hosts/inventories/smart-inventory/add/smart-inventory-add.controller.js

@@ -12,13 +12,11 @@
 
 function SmartInventoryAdd($scope, $location,
     GenerateForm, smartInventoryForm, rbacUiControlService, Rest, Alert, ProcessErrors,
-    ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
+    GetBasePath, ParseTypeChange, Wait, ToJSON,
     $state, canAdd) {
 
     $scope.canAdd = canAdd;
 
-    ClearScope();
-
     // Inject dynamic view
     var defaultUrl = GetBasePath('inventory'),
         form = smartInventoryForm;
@@ -90,6 +88,6 @@ function SmartInventoryAdd($scope, $location,
 
 export default ['$scope', '$location',
     'GenerateForm', 'smartInventoryForm', 'rbacUiControlService', 'Rest', 'Alert',
-    'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange',
+    'ProcessErrors', 'GetBasePath', 'ParseTypeChange',
     'Wait', 'ToJSON', '$state', 'canAdd', SmartInventoryAdd
 ];

awx/ui/client/src/inventories-hosts/inventories/smart-inventory/edit/smart-inventory-edit.controller.js

@@ -6,7 +6,7 @@
 
 function SmartInventoryEdit($scope, $location,
     $stateParams, InventoryForm, Rest, ProcessErrors,
-    ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
+    GetBasePath, ParseTypeChange, Wait, ToJSON,
     ParseVariableString, $state, OrgAdminLookup, resourceData, $rootScope) {
 
     // Inject dynamic view
@@ -14,12 +14,9 @@ function SmartInventoryEdit($scope, $location,
         form = InventoryForm,
         inventory_id = $stateParams.smartinventory_id,
         inventoryData = resourceData.data;
-
-    ClearScope();
     init();
 
     function init() {
-        ClearScope();
         form.formLabelSize = null;
         form.formFieldSize = null;
         $scope.inventory_id = inventory_id;
@@ -97,7 +94,7 @@ function SmartInventoryEdit($scope, $location,
 
 export default [ '$scope', '$location',
     '$stateParams', 'InventoryForm', 'Rest',
-    'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange', 'Wait',
+    'ProcessErrors', 'GetBasePath', 'ParseTypeChange', 'Wait',
     'ToJSON', 'ParseVariableString',
     '$state', 'OrgAdminLookup', 'resourceData', '$rootScope', SmartInventoryEdit
 ];

awx/ui/client/src/inventories-hosts/inventories/standard-inventory/add/inventory-add.controller.js

@@ -12,13 +12,11 @@
 
 function InventoriesAdd($scope, $location,
     GenerateForm, InventoryForm, rbacUiControlService, Rest, Alert, ProcessErrors,
-    ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
+    GetBasePath, ParseTypeChange, Wait, ToJSON,
     $state, canAdd, CreateSelect2, InstanceGroupsService) {
 
     $scope.canAdd = canAdd;
 
-    ClearScope();
-
     // Inject dynamic view
     var defaultUrl = GetBasePath('inventory'),
         form = InventoryForm;
@@ -96,6 +94,6 @@ function InventoriesAdd($scope, $location,
 
 export default ['$scope', '$location',
     'GenerateForm', 'InventoryForm', 'rbacUiControlService', 'Rest', 'Alert',
-    'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange',
+    'ProcessErrors', 'GetBasePath', 'ParseTypeChange',
     'Wait', 'ToJSON', '$state','canAdd', 'CreateSelect2', 'InstanceGroupsService', InventoriesAdd
-];
+];

awx/ui/client/src/inventories-hosts/inventories/standard-inventory/edit/inventory-edit.controller.js

@@ -12,7 +12,7 @@
 
 function InventoriesEdit($scope, $location,
     $stateParams, InventoryForm, Rest, ProcessErrors,
-    ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
+    GetBasePath, ParseTypeChange, Wait, ToJSON,
     ParseVariableString, $state, OrgAdminLookup, $rootScope, resourceData, CreateSelect2, InstanceGroupsService, InstanceGroupsData) {
 
     // Inject dynamic view
@@ -111,7 +111,7 @@ function InventoriesEdit($scope, $location,
 
 export default ['$scope', '$location',
     '$stateParams', 'InventoryForm', 'Rest',
-    'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange', 'Wait',
+    'ProcessErrors', 'GetBasePath', 'ParseTypeChange', 'Wait',
     'ToJSON', 'ParseVariableString',
     '$state', 'OrgAdminLookup', '$rootScope', 'resourceData', 'CreateSelect2', 'InstanceGroupsService', 'InstanceGroupsData', InventoriesEdit,
 ];

awx/ui/client/src/jobs/jobs-list.controller.js

@@ -11,14 +11,12 @@
  */
 
  export default ['$state', '$rootScope', '$scope', '$stateParams',
-     'ClearScope', 'Find', 'DeleteJob', 'RelaunchJob',
+     'Find', 'DeleteJob', 'RelaunchJob',
      'GetBasePath', 'Dataset', 'QuerySet', 'ListDefinition', '$interpolate',
      function($state, $rootScope, $scope, $stateParams,
-         ClearScope, Find, DeleteJob, RelaunchJob,
+         Find, DeleteJob, RelaunchJob,
          GetBasePath, Dataset, qs, ListDefinition, $interpolate) {
 
-    ClearScope();
-
     var list = ListDefinition;
 
     init();

awx/ui/client/src/login/loginModal/loginModal.directive.js

@@ -8,9 +8,8 @@ import authenticationController from './loginModal.controller';
 /* jshint unused: vars */
 export default
     [     'templateUrl',
-        'ClearScope',
         'Wait',
-        function(templateUrl, ClearScope, Wait) {
+        function(templateUrl, Wait) {
             return {
                 restrict: 'E',
                 scope: true,
@@ -19,7 +18,6 @@ export default
                 link: function(scope, element, attrs) {
                     var setLoginFocus = function () {
                         // Need to clear out any open dialog windows that might be open when this modal opens.
-                        ClearScope();
                         $('#login-username').focus();
                     };
 

awx/ui/client/src/organizations/add/organizations-add.controller.js

@@ -6,9 +6,9 @@
 
 export default ['$scope', '$rootScope', '$location', '$stateParams',
     'OrganizationForm', 'GenerateForm', 'Rest', 'Alert',
-    'ProcessErrors', 'ClearScope', 'GetBasePath', 'Wait', 'CreateSelect2', '$state','InstanceGroupsService',
+    'ProcessErrors', 'GetBasePath', 'Wait', 'CreateSelect2', '$state','InstanceGroupsService',
     function($scope, $rootScope, $location, $stateParams, OrganizationForm,
-    GenerateForm, Rest, Alert, ProcessErrors, ClearScope, GetBasePath, Wait, CreateSelect2, $state, InstanceGroupsService) {
+    GenerateForm, Rest, Alert, ProcessErrors, GetBasePath, Wait, CreateSelect2, $state, InstanceGroupsService) {
 
         Rest.setUrl(GetBasePath('organizations'));
         Rest.options()
@@ -19,8 +19,6 @@ export default ['$scope', '$rootScope', '$location', '$stateParams',
                 }
             });
 
-        ClearScope();
-
         var form = OrganizationForm(),
             base = $location.path().replace(/^\//, '').split('/')[0];
         init();

awx/ui/client/src/organizations/edit/organizations-edit.controller.js

@@ -5,14 +5,12 @@
  *************************************************/
 
 export default ['$scope', '$location', '$stateParams',
-    'OrganizationForm', 'Rest', 'ProcessErrors', 'Prompt', 'ClearScope',
+    'OrganizationForm', 'Rest', 'ProcessErrors', 'Prompt',
     'GetBasePath', 'Wait', '$state', 'ToggleNotification', 'CreateSelect2', 'InstanceGroupsService', 'InstanceGroupsData',
     function($scope, $location, $stateParams,
-        OrganizationForm, Rest, ProcessErrors, Prompt, ClearScope,
+        OrganizationForm, Rest, ProcessErrors, Prompt,
         GetBasePath, Wait, $state, ToggleNotification, CreateSelect2, InstanceGroupsService, InstanceGroupsData) {
 
-        ClearScope();
-
         let form = OrganizationForm(),
             defaultUrl = GetBasePath('organizations'),
             base = $location.path().replace(/^\//, '').split('/')[0],

awx/ui/client/src/organizations/list/organizations-list.controller.js

@@ -6,14 +6,12 @@
 
 
 export default ['$stateParams', '$scope', '$rootScope',
-    'Rest', 'OrganizationList', 'Prompt', 'ClearScope',
+    'Rest', 'OrganizationList', 'Prompt',
     'ProcessErrors', 'GetBasePath', 'Wait', '$state', 'rbacUiControlService', '$filter', 'Dataset', 'i18n',
     function($stateParams, $scope, $rootScope,
-        Rest, OrganizationList, Prompt, ClearScope,
+        Rest, OrganizationList, Prompt,
         ProcessErrors, GetBasePath, Wait, $state, rbacUiControlService, $filter, Dataset, i18n) {
 
-        ClearScope();
-
         var defaultUrl = GetBasePath('organizations'),
             list = OrganizationList;
 

awx/ui/client/src/projects/edit/projects-edit.controller.js

@@ -5,17 +5,15 @@
  *************************************************/
 
 export default ['$scope', '$rootScope', '$stateParams', 'ProjectsForm', 'Rest',
-    'Alert', 'ProcessErrors', 'GenerateForm', 'Prompt', 'ClearScope',
+    'Alert', 'ProcessErrors', 'GenerateForm', 'Prompt',
     'GetBasePath', 'GetProjectPath', 'Authorization', 'GetChoices', 'Empty',
     'Wait', 'ProjectUpdate', '$state', 'CreateSelect2', 'ToggleNotification',
     'i18n', 'CredentialTypes',
     function($scope, $rootScope, $stateParams, ProjectsForm, Rest, Alert,
-    ProcessErrors, GenerateForm, Prompt, ClearScope, GetBasePath,
+    ProcessErrors, GenerateForm, Prompt, GetBasePath,
     GetProjectPath, Authorization, GetChoices, Empty, Wait, ProjectUpdate,
     $state, CreateSelect2, ToggleNotification, i18n, CredentialTypes) {
 
-        ClearScope('htmlTemplate');
-
         var form = ProjectsForm(),
             defaultUrl = GetBasePath('projects') + $stateParams.project_id + '/',
             master = {},

awx/ui/client/src/scheduler/schedulerList.controller.js

@@ -13,16 +13,14 @@
 
 export default [
     '$scope', '$location', '$stateParams', 'ScheduleList', 'Rest',
-    'ClearScope', 'rbacUiControlService',
+    'rbacUiControlService',
     'ToggleSchedule', 'DeleteSchedule', '$q', '$state', 'Dataset', 'ParentObject', 'UnifiedJobsOptions',
     function($scope, $location, $stateParams,
-        ScheduleList, Rest, ClearScope,
+        ScheduleList, Rest,
         rbacUiControlService,
         ToggleSchedule, DeleteSchedule,
         $q, $state, Dataset, ParentObject, UnifiedJobsOptions) {
 
-        ClearScope();
-
         var base, scheduleEndpoint,
             list = ScheduleList;
 

awx/ui/client/src/shared/Utilities.js

@@ -20,43 +20,6 @@
 export default
 angular.module('Utilities', ['RestServices', 'Utilities'])
 
-/**
- * @ngdoc method
- * @name shared.function:Utilities#ClearScope
- * @methodOf shared.function:Utilities
- * @description
- *  Place to remove things that might be lingering from a prior tab or view.
- *  This used to destroy the scope, but that causes issues in angular 1.2.x
- */
-.factory('ClearScope', ['$rootScope', function($rootScope) {
-    return function() {
-
-        $rootScope.flashMessage = null;
-
-        //$('#form-modal .modal-body').empty();
-        $('#form-modal2 .modal-body').empty();
-
-        $('.tooltip').each(function() {
-            $(this).remove();
-        });
-
-        $('.popover').each(function() {
-            $(this).remove();
-        });
-
-        $('.ui-dialog-content').each(function() {
-            $(this).dialog('close');
-        });
-
-        try {
-            $('#help-modal').dialog('close');
-        } catch (e) {
-            // ignore
-        }
-    };
-}])
-
-
 /**
  * @ngdoc method
  * @name shared.function:Utilities#Empty

awx/ui/client/src/standard-out/standard-out.controller.js

@@ -11,11 +11,9 @@
 */
 
 export function JobStdoutController ($rootScope, $scope, $state, $stateParams,
-    ClearScope, GetBasePath, Rest, ProcessErrors, Empty, GetChoices, LookUpName,
+    GetBasePath, Rest, ProcessErrors, Empty, GetChoices, LookUpName,
     ParseTypeChange, ParseVariableString, RelaunchJob, DeleteJob, Wait, i18n) {
 
-    ClearScope();
-
     var job_id = $stateParams.id,
         jobType = $state.current.data.jobType;
 
@@ -279,6 +277,6 @@ export function JobStdoutController ($rootScope, $scope, $state, $stateParams,
 }
 
 JobStdoutController.$inject = [ '$rootScope', '$scope', '$state',
-    '$stateParams', 'ClearScope', 'GetBasePath', 'Rest', 'ProcessErrors',
+    '$stateParams', 'GetBasePath', 'Rest', 'ProcessErrors',
     'Empty', 'GetChoices',  'LookUpName', 'ParseTypeChange',
     'ParseVariableString', 'RelaunchJob', 'DeleteJob', 'Wait', 'i18n'];

awx/ui/client/src/teams/add/teams-add.controller.js

@@ -5,12 +5,9 @@
  *************************************************/
 
 export default ['$scope', '$rootScope', 'TeamForm', 'GenerateForm', 'Rest',
-    'Alert', 'ProcessErrors', 'ClearScope', 'GetBasePath', 'Wait',  '$state',
+    'Alert', 'ProcessErrors', 'GetBasePath', 'Wait',  '$state',
     function($scope, $rootScope, TeamForm, GenerateForm, Rest, Alert,
-    ProcessErrors, ClearScope, GetBasePath, Wait, $state) {
+    ProcessErrors, GetBasePath, Wait, $state) {
-
-        ClearScope('htmlTemplate'); //Garbage collection. Don't leave behind any listeners/watchers from the prior
-        //$scope.
 
         Rest.setUrl(GetBasePath('teams'));
         Rest.options()

awx/ui/client/src/teams/edit/teams-edit.controller.js

@@ -5,10 +5,9 @@
  *************************************************/
 
 export default ['$scope', '$rootScope', '$stateParams', 'TeamForm', 'Rest',
-    'ProcessErrors', 'ClearScope', 'GetBasePath', 'Wait', '$state',
+    'ProcessErrors', 'GetBasePath', 'Wait', '$state',
     function($scope, $rootScope, $stateParams, TeamForm, Rest, ProcessErrors,
-    ClearScope, GetBasePath, Wait, $state) {
+    GetBasePath, Wait, $state) {
-        ClearScope();
 
         var form = TeamForm,
             id = $stateParams.team_id,

awx/ui/client/src/teams/list/teams-list.controller.js

@@ -4,14 +4,12 @@
  * All Rights Reserved
  *************************************************/
 
-export default ['$scope', 'Rest', 'TeamList', 'Prompt', 'ClearScope',
+export default ['$scope', 'Rest', 'TeamList', 'Prompt',
     'ProcessErrors', 'GetBasePath', 'Wait', '$state', '$filter',
     'rbacUiControlService', 'Dataset',
-    function($scope, Rest, TeamList, Prompt, ClearScope, ProcessErrors,
+    function($scope, Rest, TeamList, Prompt, ProcessErrors,
     GetBasePath, Wait, $state, $filter, rbacUiControlService, Dataset) {
 
-        ClearScope();
-
         var list = TeamList,
             defaultUrl = GetBasePath('teams');
 

awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js

@@ -7,13 +7,13 @@
  export default
      [   '$filter', '$scope',
         '$stateParams', 'JobTemplateForm', 'GenerateForm', 'Rest', 'Alert',
-        'ProcessErrors', 'ClearScope', 'GetBasePath', 'md5Setup', 'ParseTypeChange', 'Wait',
+        'ProcessErrors', 'GetBasePath', 'md5Setup', 'ParseTypeChange', 'Wait',
         'Empty', 'ToJSON', 'CallbackHelpInit', 'GetChoices', '$state',
          'CreateSelect2', '$q', 'i18n', 'Inventory', 'Project', 'InstanceGroupsService', 'MultiCredentialService',
          function(
              $filter, $scope,
              $stateParams, JobTemplateForm, GenerateForm, Rest, Alert,
-             ProcessErrors, ClearScope, GetBasePath, md5Setup, ParseTypeChange, Wait,
+             ProcessErrors, GetBasePath, md5Setup, ParseTypeChange, Wait,
              Empty, ToJSON, CallbackHelpInit, GetChoices,
              $state, CreateSelect2, $q, i18n, Inventory, Project, InstanceGroupsService, MultiCredentialService
          ) {
@@ -27,7 +27,6 @@
                      }
                  });
 
-            ClearScope();
             // Inject dynamic view
             let defaultUrl = GetBasePath('job_templates'),
                 form = JobTemplateForm(),

awx/ui/client/src/templates/job_templates/edit-job-template/job-template-edit.controller.js

@@ -13,7 +13,7 @@
 export default
     [   '$filter', '$scope', '$rootScope',
         '$location', '$stateParams', 'JobTemplateForm', 'GenerateForm',
-        'Rest', 'Alert',  'ProcessErrors', 'ClearScope', 'GetBasePath', 'md5Setup',
+        'Rest', 'Alert',  'ProcessErrors', 'GetBasePath', 'md5Setup',
         'ParseTypeChange', 'Wait',
         'Empty', 'Prompt', 'ToJSON', 'GetChoices', 'CallbackHelpInit',
         'InitiatePlaybookRun' , 'initSurvey', '$state', 'CreateSelect2',
@@ -21,14 +21,12 @@ export default
         function(
             $filter, $scope, $rootScope,
             $location, $stateParams, JobTemplateForm, GenerateForm, Rest, Alert,
-            ProcessErrors, ClearScope, GetBasePath, md5Setup,
+            ProcessErrors, GetBasePath, md5Setup,
             ParseTypeChange, Wait,
             Empty, Prompt, ToJSON, GetChoices, CallbackHelpInit, InitiatePlaybookRun, SurveyControllerInit, $state,
             CreateSelect2, ToggleNotification, $q, InstanceGroupsService, InstanceGroupsData, MultiCredentialService
         ) {
 
-            ClearScope();
-
             $scope.$watch('job_template_obj.summary_fields.user_capabilities.edit', function(val) {
                 if (val === false) {
                     $scope.canAddJobTemplate = false;

awx/ui/client/src/templates/list/templates-list.controller.js

@@ -5,17 +5,16 @@
  *************************************************/
 
 export default ['$scope', '$rootScope',
-    'Alert','TemplateList', 'Prompt', 'ClearScope', 'ProcessErrors',
+    'Alert','TemplateList', 'Prompt', 'ProcessErrors',
     'GetBasePath', 'InitiatePlaybookRun', 'Wait', '$state', '$filter',
     'Dataset', 'rbacUiControlService', 'TemplatesService','QuerySet',
     'TemplateCopyService',
     function(
         $scope, $rootScope, Alert,
-        TemplateList, Prompt, ClearScope, ProcessErrors, GetBasePath,
+        TemplateList, Prompt, ProcessErrors, GetBasePath,
         InitiatePlaybookRun, Wait, $state, $filter, Dataset, rbacUiControlService, TemplatesService,
         qs, TemplateCopyService
     ) {
-        ClearScope();
 
         var list = TemplateList;
 
@@ -77,7 +76,7 @@ export default ['$scope', '$rootScope',
                 $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
             });
         });
-        
+
         $scope.editJobTemplate = function(template) {
             if(template) {
                     if(template.type && (template.type === 'Job Template' || template.type === 'job_template')) {

awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js

@@ -6,10 +6,10 @@
 
 export default [
     '$scope', 'WorkflowForm', 'GenerateForm', 'Alert', 'ProcessErrors',
-    'ClearScope', 'Wait', '$state', 'CreateSelect2', 'TemplatesService',
+    'Wait', '$state', 'CreateSelect2', 'TemplatesService',
     'ToJSON', 'ParseTypeChange', '$q', 'Rest', 'GetBasePath',
     function($scope, WorkflowForm, GenerateForm, Alert, ProcessErrors,
-    ClearScope, Wait, $state, CreateSelect2, TemplatesService, ToJSON,
+    Wait, $state, CreateSelect2, TemplatesService, ToJSON,
     ParseTypeChange, $q, Rest, GetBasePath) {
 
          Rest.setUrl(GetBasePath('workflow_job_templates'));
@@ -21,7 +21,6 @@ export default [
                  }
              });
 
-         ClearScope();
          // Inject dynamic view
          let form = WorkflowForm(),
              generator = GenerateForm;

awx/ui/client/src/templates/workflows/edit-workflow/workflow-edit.controller.js

@@ -6,15 +6,14 @@
 
 export default [
     '$scope', '$stateParams', 'WorkflowForm', 'GenerateForm', 'Alert',
-    'ProcessErrors', 'ClearScope', 'GetBasePath', '$q', 'ParseTypeChange',
+    'ProcessErrors', 'GetBasePath', '$q', 'ParseTypeChange',
     'Wait', 'Empty', 'ToJSON', 'initSurvey', '$state', 'CreateSelect2',
     'ParseVariableString', 'TemplatesService', 'Rest', 'ToggleNotification',
     'OrgAdminLookup',
     function($scope, $stateParams, WorkflowForm, GenerateForm, Alert,
-    ProcessErrors, ClearScope, GetBasePath, $q, ParseTypeChange, Wait, Empty,
+    ProcessErrors, GetBasePath, $q, ParseTypeChange, Wait, Empty,
     ToJSON, SurveyControllerInit, $state, CreateSelect2, ParseVariableString,
     TemplatesService, Rest, ToggleNotification, OrgAdminLookup) {
-        ClearScope();
 
         $scope.$watch('workflow_job_template_obj.summary_fields.user_capabilities.edit', function(val) {
             if (val === false) {

awx/ui/client/src/users/add/users-add.controller.js

@@ -13,12 +13,11 @@ const user_type_options = [
 ];
 
 export default ['$scope', '$rootScope', 'UserForm', 'GenerateForm', 'Rest',
-    'Alert', 'ProcessErrors', 'ReturnToCaller', 'ClearScope', 'GetBasePath',
+    'Alert', 'ProcessErrors', 'ReturnToCaller', 'GetBasePath',
     'Wait', 'CreateSelect2', '$state', '$location', 'i18n',
     function($scope, $rootScope, UserForm, GenerateForm, Rest, Alert,
-    ProcessErrors, ReturnToCaller, ClearScope, GetBasePath, Wait, CreateSelect2,
+    ProcessErrors, ReturnToCaller, GetBasePath, Wait, CreateSelect2,
     $state, $location, i18n) {
-        ClearScope();
 
         var defaultUrl = GetBasePath('organizations'),
             form = UserForm;

awx/ui/client/src/users/edit/users-edit.controller.js

@@ -13,15 +13,14 @@ const user_type_options = [
 ];
 
 export default ['$scope', '$rootScope', '$stateParams', 'UserForm', 'Rest',
-    'ProcessErrors', 'ClearScope', 'GetBasePath', 'Wait', 'CreateSelect2',
+    'ProcessErrors', 'GetBasePath', 'Wait', 'CreateSelect2',
     '$state', 'i18n',
     function($scope, $rootScope, $stateParams, UserForm, Rest, ProcessErrors,
-    ClearScope, GetBasePath, Wait, CreateSelect2, $state, i18n) {
+    GetBasePath, Wait, CreateSelect2, $state, i18n) {
 
         for (var i = 0; i < user_type_options.length; i++) {
             user_type_options[i].label = i18n._(user_type_options[i].label);
         }
-        ClearScope();
 
         var form = UserForm,
             master = {},

awx/ui/client/src/users/list/users-list.controller.js

@@ -13,9 +13,9 @@ const user_type_options = [
 ];
 
 export default ['$scope', '$rootScope', 'Rest', 'UserList', 'Prompt',
-    'ClearScope', 'ProcessErrors', 'GetBasePath', 'Wait', '$state', '$filter',
+    'ProcessErrors', 'GetBasePath', 'Wait', '$state', '$filter',
     'rbacUiControlService', 'Dataset', 'i18n',
-    function($scope, $rootScope, Rest, UserList, Prompt, ClearScope,
+    function($scope, $rootScope, Rest, UserList, Prompt,
     ProcessErrors, GetBasePath, Wait, $state, $filter, rbacUiControlService,
     Dataset, i18n) {
 
@@ -23,8 +23,6 @@ export default ['$scope', '$rootScope', 'Rest', 'UserList', 'Prompt',
             user_type_options[i].label = i18n._(user_type_options[i].label);
         }
 
-        ClearScope();
-
         var list = UserList,
             defaultUrl = GetBasePath('users');
 

awx/ui/tests/spec/templates/templates-list.controller-test.js

@@ -6,7 +6,6 @@ describe('Controller: TemplatesList', () => {
         rootScope,
         state,
         TemplatesListController,
-        ClearScope,
         GetChoices,
         Alert,
         Prompt,
@@ -53,7 +52,6 @@ describe('Controller: TemplatesList', () => {
             }
         };
 
-        ClearScope = jasmine.createSpy('ClearScope');
         GetChoices = jasmine.createSpy('GetChoices');
         Alert = jasmine.createSpy('Alert');
         Prompt = jasmine.createSpy('Prompt').and.callFake(function(args) {
@@ -61,7 +59,6 @@ describe('Controller: TemplatesList', () => {
         });
         InitiatePlaybookRun = jasmine.createSpy('InitiatePlaybookRun');
 
-        $provide.value('ClearScope', ClearScope);
         $provide.value('GetChoices', GetChoices);
         $provide.value('Alert', Alert);
         $provide.value('Prompt', Prompt);
@@ -69,12 +66,11 @@ describe('Controller: TemplatesList', () => {
         $provide.value('InitiatePlaybookRun', InitiatePlaybookRun);
     }));
 
-    beforeEach(angular.mock.inject( ($rootScope, $controller, $q, _state_, _ConfigService_, _ClearScope_, _GetChoices_, _Alert_, _Prompt_, _InitiatePlaybookRun_) => {
+    beforeEach(angular.mock.inject( ($rootScope, $controller, $q, _state_, _ConfigService_, _GetChoices_, _Alert_, _Prompt_, _InitiatePlaybookRun_) => {
         scope = $rootScope.$new();
         rootScope = $rootScope;
         q = $q;
         state = _state_;
-        ClearScope = _ClearScope_;
         GetChoices = _GetChoices_;
         Alert = _Alert_;
         Prompt = _Prompt_;
@@ -92,7 +88,6 @@ describe('Controller: TemplatesList', () => {
             $scope: scope,
             $rootScope: rootScope,
             $state: state,
-            ClearScope: ClearScope,
             GetChoices: GetChoices,
             Alert: Alert,
             Prompt: Prompt,

awx/ui/tests/spec/workflows/workflow-add.controller-test.js

@@ -5,7 +5,6 @@ describe('Controller: WorkflowAdd', () => {
     let scope,
         state,
         WorkflowAdd,
-        ClearScope,
         Alert,
         GenerateForm,
         TemplatesService,
@@ -45,7 +44,6 @@ describe('Controller: WorkflowAdd', () => {
             }
         };
 
-        ClearScope = jasmine.createSpy('ClearScope');
         Alert = jasmine.createSpy('Alert');
         ProcessErrors = jasmine.createSpy('ProcessErrors');
         CreateSelect2 = jasmine.createSpy('CreateSelect2');
@@ -53,7 +51,6 @@ describe('Controller: WorkflowAdd', () => {
         ParseTypeChange = jasmine.createSpy('ParseTypeChange');
         ToJSON = jasmine.createSpy('ToJSON');
 
-        $provide.value('ClearScope', ClearScope);
         $provide.value('Alert', Alert);
         $provide.value('GenerateForm', GenerateForm);
         $provide.value('state', state);
@@ -64,11 +61,10 @@ describe('Controller: WorkflowAdd', () => {
         $provide.value('ToJSON', ToJSON);
     }));
 
-    beforeEach(angular.mock.inject( ($rootScope, $controller, $q, $httpBackend, _state_, _ConfigService_, _ClearScope_, _GetChoices_, _Alert_, _GenerateForm_, _ProcessErrors_, _CreateSelect2_, _Wait_, _ParseTypeChange_, _ToJSON_) => {
+    beforeEach(angular.mock.inject( ($rootScope, $controller, $q, $httpBackend, _state_, _ConfigService_, _GetChoices_, _Alert_, _GenerateForm_, _ProcessErrors_, _CreateSelect2_, _Wait_, _ParseTypeChange_, _ToJSON_) => {
         scope = $rootScope.$new();
         state = _state_;
         q = $q;
-        ClearScope = _ClearScope_;
         Alert = _Alert_;
         GenerateForm = _GenerateForm_;
         httpBackend = $httpBackend;
@@ -94,7 +90,6 @@ describe('Controller: WorkflowAdd', () => {
         WorkflowAdd = $controller('WorkflowAdd', {
             $scope: scope,
             $state: state,
-            ClearScope: ClearScope,
             Alert: Alert,
             GenerateForm: GenerateForm,
             TemplatesService: TemplatesService,
@@ -106,10 +101,6 @@ describe('Controller: WorkflowAdd', () => {
         });
     }));
 
-    it('should call ClearScope', ()=>{
-        expect(ClearScope).toHaveBeenCalled();
-    });
-
     it('should get/set the label options and select2-ify the input', ()=>{
         // Resolve TemplatesService.getLabelsForJobTemplate
         getLabelsDeferred.resolve({