Author: srimanth
Date: Sat Apr 13 00:18:49 2013
New Revision: 1467527
URL: http://svn.apache.org/r1467527
Log:
AMBARI-1916. Filter for showing only properties which need restart is broken.
(srimanth)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/utils/config.js
incubator/ambari/trunk/ambari-web/app/views/common/configs/services_config.js
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1467527&r1=1467526&r2=1467527&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Sat Apr 13 00:18:49 2013
@@ -704,6 +704,9 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1916. Filter for showing only properties which need restart is
+ broken. (srimanth)
+
AMBARI-1918. Set correct Oozie property for security instead of deprecated
property. (jaimin)
Modified: incubator/ambari/trunk/ambari-web/app/utils/config.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/config.js?rev=1467527&r1=1467526&r2=1467527&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/config.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/config.js Sat Apr 13 00:18:49
2013
@@ -580,7 +580,9 @@ App.config = Em.Object.create({
var apv = actualConfigs[property];
if (dpv !== apv && globalPropertyToServicesMap[property] !=
null) {
effected =
globalPropertyToServicesMap[property].indexOf(service) > -1;
-
this.differentGlobalTagsCache.push(service+"/"+desiredTag+"/"+actualTag);
+ if(effected){
+
this.differentGlobalTagsCache.push(service+"/"+desiredTag+"/"+actualTag);
+ }
}
}
}
Modified:
incubator/ambari/trunk/ambari-web/app/views/common/configs/services_config.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/common/configs/services_config.js?rev=1467527&r1=1467526&r2=1467527&view=diff
==============================================================================
---
incubator/ambari/trunk/ambari-web/app/views/common/configs/services_config.js
(original)
+++
incubator/ambari/trunk/ambari-web/app/views/common/configs/services_config.js
Sat Apr 13 00:18:49 2013
@@ -95,6 +95,7 @@ App.ServiceConfigsByCategoryView = Ember
var filter = this.get('parentView.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 isOnlyRestartRequired = this.get('parentView.columns').length &&
this.get('parentView.columns')[2].get('selected');
var filteredResult = this.get('categoryConfigs').filter(function(config){
if(isOnlyModified && !config.get('isNotDefaultValue')){
@@ -105,6 +106,10 @@ App.ServiceConfigsByCategoryView = Ember
return false;
}
+ if(isOnlyRestartRequired && !config.get('isRestartRequired')){
+ return false;
+ }
+
var searchString = config.get('defaultValue') +
config.get('description') +
config.get('displayName') + config.get('name');
