Repository: ambari Updated Branches: refs/heads/trunk 79ff7cbdb -> e4f80ad8b
AMBARI-6638 Config categories aren't displayed on 'Configure Services' step of Secrity Wizard. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/e4f80ad8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/e4f80ad8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/e4f80ad8 Branch: refs/heads/trunk Commit: e4f80ad8b5bbaed8b99bad0631db8ea8d0580d85 Parents: 79ff7cb Author: atkach <atk...@hortonworks.com> Authored: Mon Jul 28 19:44:01 2014 +0300 Committer: atkach <atk...@hortonworks.com> Committed: Mon Jul 28 19:44:01 2014 +0300 ---------------------------------------------------------------------- .../app/controllers/main/admin/security/add/step2.js | 2 ++ ambari-web/app/views/common/configs/services_config.js | 10 +++------- 2 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/e4f80ad8/ambari-web/app/controllers/main/admin/security/add/step2.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/security/add/step2.js b/ambari-web/app/controllers/main/admin/security/add/step2.js index 44fb6c2..4b28a30 100644 --- a/ambari-web/app/controllers/main/admin/security/add/step2.js +++ b/ambari-web/app/controllers/main/admin/security/add/step2.js @@ -25,6 +25,8 @@ App.MainAdminSecurityAddStep2Controller = Em.Controller.extend({ installedServices: [], selectedService: null, securityUsers: [], + filter: '', + filterColumns: [], /** * map which depict connection between config and slave component http://git-wip-us.apache.org/repos/asf/ambari/blob/e4f80ad8/ambari-web/app/views/common/configs/services_config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/common/configs/services_config.js b/ambari-web/app/views/common/configs/services_config.js index ac88a1e..0dc0529 100644 --- a/ambari-web/app/views/common/configs/services_config.js +++ b/ambari-web/app/views/common/configs/services_config.js @@ -326,15 +326,11 @@ App.ServiceConfigsByCategoryView = Ember.View.extend(App.UserPref, { */ filteredCategoryConfigs: function () { $('.popover').remove(); - var filter = this.get('parentView.filter'); - var columns = this.get('parentView.columns'); - if (filter != null) { - filter = filter.toLowerCase(); - } - var selectedFilters = this.get('parentView.columns').filterProperty('selected', true); + var filter = this.get('parentView.filter').toLowerCase(); + var selectedFilters = this.get('parentView.columns').filterProperty('selected'); var filteredResult = this.get('categoryConfigs').filter(function (config) { - var passesFilters = true; + selectedFilters.forEach(function (filter) { if (!config.get(filter.attributeName)) { passesFilters = false;
