Fixes #11886 - search parameters bleeding on details nutupane page

Katello · Oct 1, 2015 · d31d8e5 · d31d8e5
1 parent 1a5c16b
commit d31d8e5
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 4 deletions.
diff --git a/...ts/bastion_katello/activation-keys/details/activation-key-add-subscriptions.controller.js b/...ts/bastion_katello/activation-keys/details/activation-key-add-subscriptions.controller.js
@@ -32,6 +32,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeyAddSubscripti
         $scope.contentNutupane = new Nutupane(Subscription, params);
         $scope.detailsTable = $scope.contentNutupane.table;
         $scope.isAdding = false;
+        $scope.contentNutupane.setSearchKey('subscriptionSearch');
         $scope.contentNutupane.masterOnly = true;
 
         $scope.groupedSubscriptions = {};

diff --git a/...cripts/bastion_katello/activation-keys/details/activation-key-subscriptions.controller.js b/...cripts/bastion_katello/activation-keys/details/activation-key-subscriptions.controller.js
@@ -27,6 +27,7 @@ angular.module('Bastion.activation-keys').controller('ActivationKeySubscriptions
         $scope.contentNutupane = new Nutupane(Subscription, params);
         $scope.detailsTable = $scope.contentNutupane.table;
         $scope.contentNutupane.masterOnly = true;
+        $scope.contentNutupane.setSearchKey('subscriptionSearch');
         $scope.isRemoving = false;
 
         $scope.groupedSubscriptions = {};

diff --git a/...cripts/bastion_katello/content-hosts/details/content-host-add-subscriptions.controller.js b/...cripts/bastion_katello/content-hosts/details/content-host-add-subscriptions.controller.js
@@ -27,6 +27,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostAddSubscriptionsC
 
         $scope.contentNutupane = new Nutupane(Subscription, params);
         $scope.detailsTable = $scope.contentNutupane.table;
+        $scope.contentNutupane.setSearchKey('subscriptionSearch');
 
         $scope.contentNutupane.masterOnly = true;
         $scope.isAdding = false;

diff --git a/...avascripts/bastion_katello/content-hosts/details/content-host-subscriptions.controller.js b/...avascripts/bastion_katello/content-hosts/details/content-host-subscriptions.controller.js
@@ -25,6 +25,7 @@ angular.module('Bastion.content-hosts').controller('ContentHostSubscriptionsCont
 
         $scope.contentNutupane = new Nutupane(Subscription, params);
         $scope.detailsTable = $scope.contentNutupane.table;
+        $scope.contentNutupane.setSearchKey('subscriptionSearch');
 
         $scope.contentNutupane.masterOnly = true;
         $scope.isRemoving = false;

diff --git a/...sets/javascripts/bastion_katello/errata/details/errata-details-repositories.controller.js b/...sets/javascripts/bastion_katello/errata/details/errata-details-repositories.controller.js
@@ -25,7 +25,7 @@ function ($scope, $q, Nutupane, Repository, Environment, ContentView, CurrentOrg
     $scope.detailsTable = repositoriesNutupane.table;
     $scope.detailsTable.initialLoad = false;
     repositoriesNutupane.masterOnly = true;
-    repositoriesNutupane.searchKey = 'repositoriesSearch';
+    repositoriesNutupane.setSearchKey('repositoriesSearch');
 
     environment = Environment.queryUnpaged(function (response) {
         $scope.environments = response.results;

diff --git a/...s/javascripts/bastion_katello/packages/details/package-details-repositories.controller.js b/...s/javascripts/bastion_katello/packages/details/package-details-repositories.controller.js
@@ -26,7 +26,7 @@ angular.module('Bastion.packages').controller('PackageDetailsRepositoriesControl
         $scope.detailsTable = repositoriesNutupane.table;
         $scope.detailsTable.initialLoad = false;
         repositoriesNutupane.masterOnly = true;
-        repositoriesNutupane.searchKey = 'repositoriesSearch';
+        repositoriesNutupane.setSearchKey('repositoriesSearch');
 
         environment = Environment.queryUnpaged(function (response) {
             $scope.environments = response.results;

diff --git a/...bastion_katello/puppet-modules/details/puppet-modules-details-content-views.controller.js b/...bastion_katello/puppet-modules/details/puppet-modules-details-content-views.controller.js
@@ -16,7 +16,7 @@
 
         contentViewsNutupane = new Nutupane(ContentViewVersion, params);
         contentViewsNutupane.masterOnly = true;
-        contentViewsNutupane.searchKey = 'contentViewsSearch';
+        contentViewsNutupane.setSearchKey('contentViewsSearch');
 
         $scope.detailsTable = contentViewsNutupane.table;
 

diff --git a/.../bastion_katello/puppet-modules/details/puppet-modules-details-repositories.controller.js b/.../bastion_katello/puppet-modules/details/puppet-modules-details-repositories.controller.js
@@ -16,7 +16,7 @@
 
         repositoriesNutupane = new Nutupane(Repository, params);
         repositoriesNutupane.masterOnly = true;
-        repositoriesNutupane.searchKey = 'repositoriesSearch';
+        repositoriesNutupane.setSearchKey('repositoriesSearch');
 
         $scope.detailsTable = repositoriesNutupane.table;
     }

diff --git a/..._katello/test/activation-keys/details/activation-key-add-subscriptions.controller.test.js b/..._katello/test/activation-keys/details/activation-key-add-subscriptions.controller.test.js
@@ -14,6 +14,7 @@ describe('Controller: ActivationKeyAddSubscriptionsController', function() {
                 showColumns: function() {}
             };
             this.get = function() {};
+            this.setSearchKey = function() {}; 
         };
         ActivationKey = {};
     });

diff --git a/...tion_katello/test/content-hosts/details/content-host-add-subscriptions.controller.test.js b/...tion_katello/test/content-hosts/details/content-host-add-subscriptions.controller.test.js
@@ -52,6 +52,7 @@ describe('Controller: ContentHostAddSubscriptionsController', function() {
             this.get = function() {};
             this.query = function() {};
             this.refresh = function() {};
+            this.setSearchKey = function() {};  
         };
         translate = function(message) {
             return message;

diff --git a/.../bastion_katello/test/content-hosts/details/content-host-subscriptions.controller.test.js b/.../bastion_katello/test/content-hosts/details/content-host-subscriptions.controller.test.js
@@ -52,6 +52,7 @@ describe('Controller: ContentHostSubscriptionsController', function() {
             this.get = function() {};
             this.query = function() {};
             this.refresh = function() {};
+            this.setSearchKey = function() {};
         };
 
         $scope.contentHost = new ContentHost({

diff --git a/...nes/bastion_katello/test/packages/details/package-details-repositories.controller.test.js b/...nes/bastion_katello/test/packages/details/package-details-repositories.controller.test.js
@@ -31,6 +31,7 @@ describe('Controller: PackageDetailsRepositoriesController', function() {
             this.load = function () {
                 return {then: function () {}}
             };
+            this.setSearchKey = function () {};
         };
 
         Environment = MockResource.$new();

diff --git a/...tello/test/puppet-modules/details/puppet-modules-details-content-views.controller.test.js b/...tello/test/puppet-modules/details/puppet-modules-details-content-views.controller.test.js
@@ -5,6 +5,7 @@ describe('Controller: PuppetModulesDetailsContentViewsController', function() {
 
     beforeEach(function() {
         Nutupane = function() {
+            this.setSearchKey = function() {};
             this.table = {
                 params: {},
                 showColumns: function() {}