From 3d5f301a0785286d0b43ba69ec3e624e94e59303 Mon Sep 17 00:00:00 2001
From: Jared Tabor <jtabor@redhat.com>
Date: Fri, 13 Oct 2017 13:10:47 -0700
Subject: [PATCH] removing notify:false, it's deprecated

---
 .../features/credentials/legacy.credentials.js | 10 +++++-----
 .../activity-stream/activitystream.route.js    |  2 +-
 awx/ui/client/src/app.js                       | 14 +++++++-------
 .../src/configuration/configuration.route.js   |  2 +-
 .../instance-groups/instance-groups.route.js   |  2 +-
 .../instance-jobs/instance-jobs-list.route.js  |  2 +-
 .../instances/instances-list.route.js          |  2 +-
 .../instance-groups/jobs/jobs-list.route.js    |  2 +-
 .../groups/hosts-related-groups.route.js       |  2 +-
 .../adhoc/adhoc-credential.route.js            |  2 +-
 .../src/inventories-hosts/inventories/main.js  |  1 +
 .../completed-jobs/completed-jobs.route.js     |  2 +-
 .../related/groups/list/groups-list.route.js   |  2 +-
 .../nested-groups/group-nested-groups.route.js |  2 +-
 .../nested-hosts/group-nested-hosts.route.js   |  2 +-
 .../related/hosts/related-host.route.js        |  2 +-
 .../nested-groups/host-nested-groups.route.js  |  2 +-
 .../related/sources/list/sources-list.route.js |  2 +-
 .../sources-lookup-inventory-script.route.js   |  2 +-
 .../smart-inventory-hosts.route.js             |  2 +-
 .../src/job-results/job-results.route.js       |  2 +-
 awx/ui/client/src/jobs/jobs.route.js           |  5 +++--
 .../linkout/organizations-linkout.route.js     |  8 ++++----
 .../jobs/portal-mode-all-jobs.route.js         |  2 +-
 .../jobs/portal-mode-my-jobs.route.js          |  2 +-
 .../src/portal-mode/portal-mode.route.js       |  4 ++--
 awx/ui/client/src/scheduler/main.js            |  2 +-
 .../smart-search/smart-search.controller.js    |  8 ++++----
 .../src/shared/stateDefinitions.factory.js     | 18 +++++++++---------
 .../src/shared/stateExtender.provider.js       |  4 ++--
 .../src/templates/list/templates-list.route.js |  2 +-
 awx/ui/client/src/templates/main.js            | 12 ++++++------
 32 files changed, 65 insertions(+), 63 deletions(-)

diff --git a/awx/ui/client/features/credentials/legacy.credentials.js b/awx/ui/client/features/credentials/legacy.credentials.js
index c294207dea..af83e9a28e 100644
--- a/awx/ui/client/features/credentials/legacy.credentials.js
+++ b/awx/ui/client/features/credentials/legacy.credentials.js
@@ -108,7 +108,7 @@ function LegacyCredentialsService () {
                     page_size: '20',
                     order_by: 'username'
                 },
-                dynamic: true,
+                dynamic: false,
                 squash: ''
             }
         },
@@ -185,14 +185,14 @@ function LegacyCredentialsService () {
                     page_size: 5,
                     is_superuser: false
                 },
-                dynamic: true
+                dynamic: false
             },
             team_search: {
                 value: {
                     order_by: 'name',
                     page_size: 5
                 },
-                dynamic: true
+                dynamic: false
             }
         },
         ncyBreadcrumb: {
@@ -240,7 +240,7 @@ function LegacyCredentialsService () {
                     order_by: 'name',
                     role_level: 'admin_role'
                 },
-                dynamic: true,
+                dynamic: false,
                 squash: ''
             }
         },
@@ -279,7 +279,7 @@ function LegacyCredentialsService () {
                     page_size: 5,
                     order_by: 'name'
                 },
-                dynamic: true,
+                dynamic: false,
                 squash: ''
             }
         },
diff --git a/awx/ui/client/src/activity-stream/activitystream.route.js b/awx/ui/client/src/activity-stream/activitystream.route.js
index ffdb424626..d2c2f7fe25 100644
--- a/awx/ui/client/src/activity-stream/activitystream.route.js
+++ b/awx/ui/client/src/activity-stream/activitystream.route.js
@@ -21,7 +21,7 @@ export default {
                 or__object1__in: null,
                 or__object2__in: null
             },
-            dynamic: true
+            dynamic: false
         }
     },
     ncyBreadcrumb: {
diff --git a/awx/ui/client/src/app.js b/awx/ui/client/src/app.js
index 92e386992d..d8fa5af0b9 100644
--- a/awx/ui/client/src/app.js
+++ b/awx/ui/client/src/app.js
@@ -3,10 +3,10 @@ global.$AnsibleConfig = null;
 // Provided via Webpack DefinePlugin in webpack.config.js
 global.$ENV = {};
 // ui-router debugging
-if ($ENV['route-debug']){
-    let trace = angular.module('ui.router').trace;
-    trace.enable();
-}
+// if ($ENV['route-debug']){
+    // let trace = angular.module('ui.router').trace;
+    // trace.enable();
+// }
 
 var urlPrefix;
 
@@ -175,13 +175,13 @@ angular
         'CheckLicense', '$location', 'Authorization', 'LoadBasePaths', 'Timer',
         'LoadConfig', 'Store', 'pendoService', 'Prompt', 'Rest',
         'Wait', 'ProcessErrors', '$state', 'GetBasePath', 'ConfigService',
-        'FeaturesService', '$filter', 'SocketService', 'AppStrings', '$transitions',
+        'FeaturesService', '$filter', 'SocketService', 'AppStrings', '$transitions', '$trace',
         function($stateExtender, $q, $compile, $cookies, $rootScope, $log, $stateParams,
             CheckLicense, $location, Authorization, LoadBasePaths, Timer,
             LoadConfig, Store, pendoService, Prompt, Rest, Wait,
             ProcessErrors, $state, GetBasePath, ConfigService, FeaturesService,
-            $filter, SocketService, AppStrings, $transitions) {
-
+            $filter, SocketService, AppStrings, $transitions, $trace) {
+            $trace.enable();
             $rootScope.$state = $state;
             $rootScope.$state.matches = function(stateName) {
                 return $state.current.name.search(stateName) > 0;
diff --git a/awx/ui/client/src/configuration/configuration.route.js b/awx/ui/client/src/configuration/configuration.route.js
index c916ecf59d..1c2eb56330 100644
--- a/awx/ui/client/src/configuration/configuration.route.js
+++ b/awx/ui/client/src/configuration/configuration.route.js
@@ -20,7 +20,7 @@
      params: {
          currentTab: {
              value: 'auth',
-             dynamic: true,
+             dynamic: false,
              isOptional: true
          }
 
diff --git a/awx/ui/client/src/instance-groups/instance-groups.route.js b/awx/ui/client/src/instance-groups/instance-groups.route.js
index c265b35cd9..819424dca8 100644
--- a/awx/ui/client/src/instance-groups/instance-groups.route.js
+++ b/awx/ui/client/src/instance-groups/instance-groups.route.js
@@ -14,7 +14,7 @@ export default {
                 page_size: '20',
                 order_by: 'name'
             },
-            dynamic: true
+            dynamic: false
         }
     },
     data: {
diff --git a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js
index 1d82ca854e..658c032915 100644
--- a/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js
+++ b/awx/ui/client/src/instance-groups/instances/instance-jobs/instance-jobs-list.route.js
@@ -15,7 +15,7 @@ export default {
                 order_by: '-finished',
                 not__launch_type: 'sync'
             },
-            dynamic: true
+            dynamic: false
         }
     },
     views: {
diff --git a/awx/ui/client/src/instance-groups/instances/instances-list.route.js b/awx/ui/client/src/instance-groups/instances/instances-list.route.js
index 16549d9d1e..ac16280560 100644
--- a/awx/ui/client/src/instance-groups/instances/instances-list.route.js
+++ b/awx/ui/client/src/instance-groups/instances/instances-list.route.js
@@ -15,7 +15,7 @@ export default {
                 page_size: '20',
                 order_by: 'hostname'
             },
-            dynamic: true
+            dynamic: false
         }
     },
     views: {
diff --git a/awx/ui/client/src/instance-groups/jobs/jobs-list.route.js b/awx/ui/client/src/instance-groups/jobs/jobs-list.route.js
index 03854eca20..5aa3d3bb54 100644
--- a/awx/ui/client/src/instance-groups/jobs/jobs-list.route.js
+++ b/awx/ui/client/src/instance-groups/jobs/jobs-list.route.js
@@ -15,7 +15,7 @@ export default {
                 order_by: '-finished',
                 not__launch_type: 'sync'
             },
-            dynamic: true
+            dynamic: false
         },
         instance_group_id: null
     },
diff --git a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.route.js b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.route.js
index fd21ff7b1d..6db3163f39 100644
--- a/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.route.js
+++ b/awx/ui/client/src/inventories-hosts/hosts/related/groups/hosts-related-groups.route.js
@@ -36,7 +36,7 @@ export default {
                 page_size: "20",
                 order_by: "name"
             },
-            dynamic: true,
+            dynamic: false,
             squash: ""
         }
     },
diff --git a/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js
index 173c77f445..1cbd57f3b6 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/adhoc/adhoc-credential.route.js
@@ -10,7 +10,7 @@ export default {
                 page_size: '5'
             },
             squash: true,
-            dynamic: true
+            dynamic: false
         }
     },
     ncyBreadcrumb: {
diff --git a/awx/ui/client/src/inventories-hosts/inventories/main.js b/awx/ui/client/src/inventories-hosts/inventories/main.js
index aec6e86e20..cf10245ffe 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/main.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/main.js
@@ -351,6 +351,7 @@ angular.module('inventory', [
             $stateProvider.state({
                 name: 'inventories.**',
                 url: '/inventories',
+                reloadOnSearch: true,
                 lazyLoad: () => generateInventoryStates()
             });
         }
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js
index 9c150aa5b2..0db0c9bad0 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/completed-jobs/completed-jobs.route.js
@@ -11,7 +11,7 @@ export default {
                 or__inventoryupdate__inventory_source__inventory:"",
                 order_by: "-id"
             },
-            dynamic: true,
+            dynamic: false,
             squash:""
         }
     },
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js
index 39dac7cca9..7c1f44d987 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/list/groups-list.route.js
@@ -37,7 +37,7 @@ export default {
                 page_size: "20",
                 order_by: "name"
             },
-            dynamic: true,
+            dynamic: false,
             squash: ""
         }
     },
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js
index 66495716ac..e5345c0c5b 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-groups/group-nested-groups.route.js
@@ -10,7 +10,7 @@ export default {
                 page_size: "20",
                 order_by: "name"
             },
-            dynamic: true,
+            dynamic: false,
             squash: ""
         }
     },
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.route.js
index 456da422d9..04c0821364 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/groups/related/nested-hosts/group-nested-hosts.route.js
@@ -10,7 +10,7 @@ export default {
                 page_size: "20",
                 order_by: "name"
             },
-            dynamic: true,
+            dynamic: false,
             squash: ""
         }
     },
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.route.js
index 0c8f6cb23a..7ee26b5768 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related-host.route.js
@@ -9,7 +9,7 @@ export default {
                 page_size: "20",
                 order_by: "name"
             },
-            dynamic: true,
+            dynamic: false,
             squash:""
         }
     },
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js
index 4600eecb63..30962ee782 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/hosts/related/nested-groups/host-nested-groups.route.js
@@ -10,7 +10,7 @@ export default {
                 page_size: "20",
                 order_by: "name"
             },
-            dynamic: true,
+            dynamic: false,
             squash: ""
         }
     },
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js
index 3d4d99546d..a9e73918b9 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/list/sources-list.route.js
@@ -10,7 +10,7 @@ export default {
                 order_by: "name",
                 not__source: ""
             },
-            dynamic: true,
+            dynamic: false,
             squash: ""
         }
     },
diff --git a/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-inventory-script.route.js b/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-inventory-script.route.js
index c2a9ab71b9..f622b90cc4 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-inventory-script.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/related/sources/lookup/sources-lookup-inventory-script.route.js
@@ -6,7 +6,7 @@ export default {
                 order_by: "name",
                 role_level: "admin_role",
             },
-            dynamic: true,
+            dynamic: false,
             squash: ""
         }
     },
diff --git a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js
index befc2c2d66..6898ee07d2 100644
--- a/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js
+++ b/awx/ui/client/src/inventories-hosts/inventories/smart-inventory/smart-inventory-hosts.route.js
@@ -9,7 +9,7 @@ export default {
                 page_size: "20",
                 order_by: "name"
             },
-            dynamic: true,
+            dynamic: false,
             squash:""
         }
     },
diff --git a/awx/ui/client/src/job-results/job-results.route.js b/awx/ui/client/src/job-results/job-results.route.js
index c648558779..2862d22a81 100644
--- a/awx/ui/client/src/job-results/job-results.route.js
+++ b/awx/ui/client/src/job-results/job-results.route.js
@@ -31,7 +31,7 @@ export default {
     params: {
         job_event_search: {
             value: defaultParams,
-            dynamic: true,
+            dynamic: false,
             squash: ''
         }
     },
diff --git a/awx/ui/client/src/jobs/jobs.route.js b/awx/ui/client/src/jobs/jobs.route.js
index ecc5e08727..b1e0a98ad4 100644
--- a/awx/ui/client/src/jobs/jobs.route.js
+++ b/awx/ui/client/src/jobs/jobs.route.js
@@ -11,6 +11,7 @@ export default {
     searchPrefix: 'job',
     name: 'jobs',
     url: '/jobs',
+    reloadOnSearch: true,
     ncyBreadcrumb: {
         label: N_("JOBS")
     },
@@ -20,8 +21,8 @@ export default {
                 not__launch_type: 'sync',
                 order_by: '-finished'
             },
-            dynamic: true,
-            squash: ''
+            dynamic: false,
+            squash: false
         }
     },
     data: {
diff --git a/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js b/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
index 14ece5f287..cd882e4384 100644
--- a/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
+++ b/awx/ui/client/src/organizations/linkout/organizations-linkout.route.js
@@ -34,7 +34,7 @@ export default [{
             value: {
                 order_by: 'username'
             },
-            dynamic: true
+            dynamic: false
         }
     },
     ncyBreadcrumb: {
@@ -239,7 +239,7 @@ export default [{
                 or__inventory__organization: null,
                 page_size: 20
             },
-            dynamic: true
+            dynamic: false
         }
     },
     data: {
@@ -297,14 +297,14 @@ export default [{
             value: {
                 order_by: 'username'
             },
-            dynamic: true
+            dynamic: false
         },
         add_user_search: {
             value: {
                 order_by: 'username',
                 page_size: '5',
             },
-            dynamic: true,
+            dynamic: false,
             squash: true
         }
     },
diff --git a/awx/ui/client/src/portal-mode/jobs/portal-mode-all-jobs.route.js b/awx/ui/client/src/portal-mode/jobs/portal-mode-all-jobs.route.js
index 582f806b89..0fe1dd766a 100644
--- a/awx/ui/client/src/portal-mode/jobs/portal-mode-all-jobs.route.js
+++ b/awx/ui/client/src/portal-mode/jobs/portal-mode-all-jobs.route.js
@@ -14,7 +14,7 @@ export default {
                 page_size: '20',
                 order_by: '-finished'
             },
-            dynamic: true
+            dynamic: false
         }
     },
     data: {
diff --git a/awx/ui/client/src/portal-mode/jobs/portal-mode-my-jobs.route.js b/awx/ui/client/src/portal-mode/jobs/portal-mode-my-jobs.route.js
index 9d5c0382f3..2a3ddfc24f 100644
--- a/awx/ui/client/src/portal-mode/jobs/portal-mode-my-jobs.route.js
+++ b/awx/ui/client/src/portal-mode/jobs/portal-mode-my-jobs.route.js
@@ -15,7 +15,7 @@ export default {
                 order_by: '-finished',
                 created_by: null
             },
-            dynamic: true
+            dynamic: false
         }
     },
     data: {
diff --git a/awx/ui/client/src/portal-mode/portal-mode.route.js b/awx/ui/client/src/portal-mode/portal-mode.route.js
index 94af95ed8e..26de1a7398 100644
--- a/awx/ui/client/src/portal-mode/portal-mode.route.js
+++ b/awx/ui/client/src/portal-mode/portal-mode.route.js
@@ -7,7 +7,7 @@ import { N_ } from '../i18n';
 export default {
     name: 'portalMode',
     url: '/portal?{job_template_search:queryset}',
-    abstract: true,
+    reloadOnSearch: true,
     ncyBreadcrumb: {
         label: N_('MY VIEW')
     },
@@ -17,7 +17,7 @@ export default {
                 page_size: '20',
                 order_by: 'name'
             },
-            dynamic: true
+            dynamic: false
         }
     },
     data: {
diff --git a/awx/ui/client/src/scheduler/main.js b/awx/ui/client/src/scheduler/main.js
index 3c72575373..5a9b30446e 100644
--- a/awx/ui/client/src/scheduler/main.js
+++ b/awx/ui/client/src/scheduler/main.js
@@ -318,7 +318,7 @@ export default
                             next_run__isnull: 'false',
                             order_by: 'unified_job_template__polymorphic_ctype__model'
                         },
-                        dynamic: true
+                        dynamic: false
                     }
                 },
                 data: {
diff --git a/awx/ui/client/src/shared/smart-search/smart-search.controller.js b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
index 678e7dee6d..a8a4d05883 100644
--- a/awx/ui/client/src/shared/smart-search/smart-search.controller.js
+++ b/awx/ui/client/src/shared/smart-search/smart-search.controller.js
@@ -122,7 +122,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
             // but will register new $stateParams[$scope.iterator + '_search'] terms
             if(!$scope.querySet) {
                 $state.go('.', {
-                    [$scope.iterator + '_search']: queryset }, {notify: false});
+                    [$scope.iterator + '_search']: queryset }, {reload:true});
             }
             qs.search(path, queryset).then((res) => {
                 if($scope.querySet) {
@@ -288,7 +288,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
                 // but will register new $stateParams[$scope.iterator + '_search'] terms
                 if(!$scope.querySet) {
                     $state.go('.', {
-                        [$scope.iterator + '_search']: queryset }, {notify: false}).then(function(){
+                        [$scope.iterator + '_search']: queryset }, { reload:true }).then(function(){
                             // ISSUE: same as above in $scope.remove.  For some reason deleting the page
                             // from the queryset works for all lists except lists in modals.
                             delete $stateParams[$scope.iterator + '_search'].page;
@@ -379,7 +379,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
             removeFromQuerySet(queryset);
             if(!$scope.querySet) {
                 $state.go('.', {
-                    [$scope.iterator + '_search']: queryset }, {notify: false}).then(function(){
+                    [$scope.iterator + '_search']: queryset }, {reload:true}).then(function(){
                         // ISSUE: for some reason deleting a tag from a list in a modal does not
                         // remove the param from $stateParams.  Here we'll manually check to make sure
                         // that that happened and remove it if it didn't.
@@ -403,7 +403,7 @@ export default ['$stateParams', '$scope', '$state', 'GetBasePath', 'QuerySet', '
             delete cleared.page;
             queryset = cleared;
             if(!$scope.querySet) {
-                $state.go('.', {[$scope.iterator + '_search']: queryset}, {notify: false});
+                $state.go('.', {[$scope.iterator + '_search']: queryset}, {reload:true});
             }
             qs.search(path, queryset).then((res) => {
                 if($scope.querySet) {
diff --git a/awx/ui/client/src/shared/stateDefinitions.factory.js b/awx/ui/client/src/shared/stateDefinitions.factory.js
index bb3977a4f7..ef073b65f3 100644
--- a/awx/ui/client/src/shared/stateDefinitions.factory.js
+++ b/awx/ui/client/src/shared/stateDefinitions.factory.js
@@ -257,27 +257,27 @@ function($injector, $stateExtender, $log, i18n) {
                     params: {
                         project_search: {
                             value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: true
+                            dynamic: false
                         },
                         job_template_search: {
                             value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: true
+                            dynamic: false
                         },
                         workflow_template_search: {
                             value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: true
+                            dynamic: false
                         },
                         inventory_search: {
                             value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: true
+                            dynamic: false
                         },
                         credential_search: {
                             value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: true
+                            dynamic: false
                         },
                         organization_search: {
                             value: {order_by: 'name', page_size: '5', role_level: 'admin_role'},
-                            dynamic: true
+                            dynamic: false
                         }
                     },
                     ncyBreadcrumb:{
@@ -398,11 +398,11 @@ function($injector, $stateExtender, $log, i18n) {
                     params: {
                         user_search: {
                             value: { order_by: 'username', page_size: '5', is_superuser: false },
-                            dynamic: true,
+                            dynamic: false,
                         },
                         team_search: {
                             value: { order_by: 'name', page_size: '5' },
-                            dynamic: true
+                            dynamic: false
                         }
                     },
                     views: {
@@ -570,7 +570,7 @@ function($injector, $stateExtender, $log, i18n) {
                     params: {
                         user_search: {
                             value: { order_by: 'username', page_size: '5' },
-                            dynamic: true,
+                            dynamic: false,
                         }
                     },
                     views: {
diff --git a/awx/ui/client/src/shared/stateExtender.provider.js b/awx/ui/client/src/shared/stateExtender.provider.js
index 60edc3f083..3a59856c9b 100644
--- a/awx/ui/client/src/shared/stateExtender.provider.js
+++ b/awx/ui/client/src/shared/stateExtender.provider.js
@@ -30,8 +30,8 @@ export default function($stateProvider) {
                                     page_size: "20",
                                     order_by: "name"
                                 },
-                                dynamic: true,
-                                squash: ''
+                                dynamic: false,
+                                squash: false
                             }
                         }
                     };
diff --git a/awx/ui/client/src/templates/list/templates-list.route.js b/awx/ui/client/src/templates/list/templates-list.route.js
index a0317842e5..5e380d423d 100644
--- a/awx/ui/client/src/templates/list/templates-list.route.js
+++ b/awx/ui/client/src/templates/list/templates-list.route.js
@@ -26,7 +26,7 @@ export default {
             value: {
                 type: 'workflow_job_template,job_template'
             },
-            dynamic: true
+            dynamic: false
         }
     },
     searchPrefix: 'template',
diff --git a/awx/ui/client/src/templates/main.js b/awx/ui/client/src/templates/main.js
index 2db04961a2..3bf816e00c 100644
--- a/awx/ui/client/src/templates/main.js
+++ b/awx/ui/client/src/templates/main.js
@@ -368,8 +368,8 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
                                 inventory__isnull: false,
                                 credential__isnull: false
                             },
-                            squash: true,
-                            dynamic: true
+                            squash: false,
+                            dynamic: false
                         },
                         project_search: {
                             value: {
@@ -377,7 +377,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
                                 order_by: 'name'
                             },
                             squash: true,
-                            dynamic: true
+                            dynamic: false
                         },
                         inventory_source_search: {
                             value: {
@@ -386,7 +386,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
                                 order_by: 'name'
                             },
                             squash: true,
-                            dynamic: true
+                            dynamic: false
                         }
                     },
                     views: {
@@ -775,7 +775,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
                                 page_size: '5'
                             },
                             squash: true,
-                            dynamic: true
+                            dynamic: false
                         }
                     },
                     ncyBreadcrumb: {
@@ -830,7 +830,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
                                 page_size: '5'
                             },
                             squash: true,
-                            dynamic: true
+                            dynamic: false
                         }
                     },
                     ncyBreadcrumb: {