Updated Branches: refs/heads/trunk d2a20742f -> 26fcd451a
AMBARI-2857. Fix for changed properties and UI (ncole) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/26fcd451 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/26fcd451 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/26fcd451 Branch: refs/heads/trunk Commit: 26fcd451a319f46c8046e75f2b34c8c1d1e65c64 Parents: d2a2074 Author: Nate Cole <[email protected]> Authored: Fri Aug 9 14:00:06 2013 -0400 Committer: Nate Cole <[email protected]> Committed: Fri Aug 9 14:06:58 2013 -0400 ---------------------------------------------------------------------- .../controllers/main/service/info/configs.js | 22 ++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/26fcd451/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index 5850df3..982fb15 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -687,12 +687,22 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({ if (serviceName === 'HDFS') { var hdfsConfigs = self.get('stepConfigs').findProperty('serviceName', 'HDFS').get('configs'); - if ( - hdfsConfigs.findProperty('name', 'dfs_name_dir').get('isNotDefaultValue') || - hdfsConfigs.findProperty('name', 'fs_checkpoint_dir').get('isNotDefaultValue') || - hdfsConfigs.findProperty('name', 'dfs_data_dir').get('isNotDefaultValue') - ) { - dirChanged = true; + if (App.get('isHadoop2Stack')) { + if ( + hdfsConfigs.findProperty('name', 'dfs_namenode_name_dir').get('isNotDefaultValue') || + hdfsConfigs.findProperty('name', 'dfs_namenode_checkpoint_dir').get('isNotDefaultValue') || + hdfsConfigs.findProperty('name', 'dfs_datanode_data_dir').get('isNotDefaultValue') + ) { + dirChanged = true; + } + } else { + if ( + hdfsConfigs.findProperty('name', 'dfs_name_dir').get('isNotDefaultValue') || + hdfsConfigs.findProperty('name', 'fs_checkpoint_dir').get('isNotDefaultValue') || + hdfsConfigs.findProperty('name', 'dfs_data_dir').get('isNotDefaultValue') + ) { + dirChanged = true; + } } } else if (serviceName === 'MAPREDUCE') { var mapredConfigs = self.get('stepConfigs').findProperty('serviceName', 'MAPREDUCE').get('configs');
