Merge pull request #4193 from ehelms/fixes-5759

Fixes #5759: Make search and filtering on Content View Filters work as i...
Katello · Jun 2, 2014 · b5dbd4f · b5dbd4f
2 parents 865d56a + 5f3fd9b
commit b5dbd4f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/...cripts/bastion/content-views/details/filters/available-package-group-filter.controller.js b/...cripts/bastion/content-views/details/filters/available-package-group-filter.controller.js
@@ -37,6 +37,7 @@ angular.module('Bastion.content-views').controller('AvailablePackageGroupFilterC
         );
 
         $scope.detailsTable = nutupane.table;
+        nutupane.table.closeItem = function () {};
 
         $scope.addPackageGroups = function (filter) {
             var packageGroupNames = nutupane.getAllSelectedResults('name').included.ids;

diff --git a/...astion/app/assets/javascripts/bastion/content-views/details/filters/filters.controller.js b/...astion/app/assets/javascripts/bastion/content-views/details/filters/filters.controller.js
@@ -43,6 +43,8 @@ angular.module('Bastion.content-views').controller('FiltersController',
             angular.forEach(filterIds, removeFilter);
         };
 
+        nutupane.table.closeItem = function () {};
+
         $scope.getFilterState = function (filter) {
             var state;
 

diff --git a/...javascripts/bastion/content-views/details/filters/package-group-list-filter.controller.js b/...javascripts/bastion/content-views/details/filters/package-group-list-filter.controller.js
@@ -37,6 +37,7 @@ angular.module('Bastion.content-views').controller('PackageGroupFilterListContro
         );
 
         $scope.detailsTable = nutupane.table;
+        nutupane.table.closeItem = function () {};
 
         $scope.removePackageGroups = function () {
             var packageGroupNames = nutupane.getAllSelectedResults('name').included.ids,

diff --git a/...ssets/javascripts/bastion/content-views/details/filters/views/package-filter-details.html b/...ssets/javascripts/bastion/content-views/details/filters/views/package-filter-details.html
@@ -3,7 +3,7 @@
     <input type="text"
            class="form-control filter-input"
            placeholder="{{ 'Filter' | translate }}"
-           ng-model="repositorySearch"/>
+           ng-model="packageFilter"/>
   </div>
 
   <button class="btn btn-default fr" ng-click="removeRules(filter)">
@@ -70,7 +70,7 @@
     </td>
   </tr>
 
-  <tr ng-repeat="rule in filter.rules" row-select="rule">
+  <tr ng-repeat="rule in filter.rules | filter:packageFilter" row-select="rule">
     <td class="row-select">
       <input type="checkbox" ng-model="rule.selected"/>
     </td>