You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2015/08/11 10:37:01 UTC
ambari git commit: AMBARI-12712 Install Wizard: Config issue counter
show incorrect number. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/trunk 483c8b6bb -> 3644af3ac
AMBARI-12712 Install Wizard: Config issue counter show incorrect number. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/3644af3a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/3644af3a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/3644af3a
Branch: refs/heads/trunk
Commit: 3644af3ac748c84cdbe4082e116f0190479773fe
Parents: 483c8b6
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Tue Aug 11 11:32:56 2015 +0300
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Aug 11 11:32:56 2015 +0300
----------------------------------------------------------------------
ambari-web/app/utils/config.js | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/3644af3a/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 7d8c0dd..7e6e574 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -559,11 +559,16 @@ App.config = Em.Object.create({
var filename = preDefined ? preDefined.filename : advanced.get('filename');
if (configTypes.contains(this.getConfigTagFromFileName(filename))) {
var configData = this.createDefaultConfig(name, filename, true, preDefined || {});
+ if (configData.recommendedValue) {
+ configData.value = configData.recommendedValue;
+ }
- configData = this.mergeStaticProperties(configData, advanced.get('id') ? advanced : null, null, ['name', 'filename']);
+ if (advanced.get('id')) {
+ configData = this.mergeStaticProperties(configData, advanced, null, ['name', 'filename']);
+ }
- if (['directory' ,'directories'].contains(configData.displayType)) {
- configData.value = configData.recommendedValue || configData.defaultDirectory || '';
+ if (['directory' ,'directories'].contains(configData.displayType) && configData.defaultDirectory) {
+ configData.value = configData.defaultDirectory;
}
mergedConfigs.push(configData);