Updated Branches: refs/heads/trunk 4d21a67da -> 364514620
AMBARI-3911. Security Wizard: Service Configuration page is broken. (srimanth) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/36451462 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/36451462 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/36451462 Branch: refs/heads/trunk Commit: 3645146205f985f0b6964bb787730ba7f2229615 Parents: 4d21a67 Author: Srimanth Gunturi <[email protected]> Authored: Wed Nov 27 18:07:30 2013 -0800 Committer: Srimanth Gunturi <[email protected]> Committed: Wed Nov 27 18:07:30 2013 -0800 ---------------------------------------------------------------------- ambari-web/app/config.js | 2 +- .../app/views/common/configs/services_config.js | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/36451462/ambari-web/app/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/config.js b/ambari-web/app/config.js index 4635265..c39c58a 100644 --- a/ambari-web/app/config.js +++ b/ambari-web/app/config.js @@ -45,7 +45,7 @@ App.enableExperimental = false; App.supports = { addServices: false, hostOverrides: true, - hostOverridesInstaller: true, + hostOverridesInstaller: false, hostOverridesHost: true, mirroring: false, secureCluster: true, http://git-wip-us.apache.org/repos/asf/ambari/blob/36451462/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 5e02741..ec77071 100644 --- a/ambari-web/app/views/common/configs/services_config.js +++ b/ambari-web/app/views/common/configs/services_config.js @@ -317,9 +317,13 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({ * Filtered <code>categoryConfigs</code> array. Used to show filtered result */ filteredCategoryConfigs: function () { - var filter = this.get('parentView.filter').toLowerCase(); + var filter = this.get('parentView.filter'); + var columns = this.get('parentView.columns'); + if (filter != null) { + filter = filter.toLowerCase(); + } //var isOnlyModified = this.get('parentView.columns').length && this.get('parentView.columns')[1].get('selected'); - var isOnlyOverridden = this.get('parentView.columns').length && this.get('parentView.columns')[0].get('selected'); + var isOnlyOverridden = columns!=null ? (columns.length && columns[0].get('selected')) : false; //var isOnlyRestartRequired = this.get('parentView.columns').length && this.get('parentView.columns')[2].get('selected'); var filteredResult = this.get('categoryConfigs').filter(function (config) { @@ -344,8 +348,11 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({ }); } - - return searchString.toLowerCase().indexOf(filter) > -1; + if (filter != null) { + return searchString.toLowerCase().indexOf(filter) > -1; + } else { + return true; + } }); filteredResult = this.sortByIndex(filteredResult); return filteredResult;
