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 2014/02/11 17:41:49 UTC
git commit: AMBARI-4606 Selecting Storm during install breaks configs
(with App.supports.appTimelineServer turned on). (Denys Buzhor via
ababiichuk)
Updated Branches:
refs/heads/trunk 3bfab6fbd -> 90b463d2b
AMBARI-4606 Selecting Storm during install breaks configs (with App.supports.appTimelineServer turned on). (Denys Buzhor via ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/90b463d2
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/90b463d2
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/90b463d2
Branch: refs/heads/trunk
Commit: 90b463d2b3004d6de14b77cd761b955b5807e600
Parents: 3bfab6f
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Tue Feb 11 18:40:09 2014 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Tue Feb 11 18:41:23 2014 +0200
----------------------------------------------------------------------
ambari-web/app/utils/config.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/90b463d2/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 9e13872..c361718 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -445,7 +445,8 @@ App.config = Em.Object.create({
}
}
if (configData.displayType === 'checkbox') {
- configData.value = configData.defaultValue = configData.value === 'true'; // convert {String} value to {Boolean}
+ configData.value = configData.value === 'true'; // convert {String} value to {Boolean}
+ configData.defaultValue = configData.value;
}
mergedConfigs.push(configData);
}, this);
@@ -597,7 +598,7 @@ App.config = Em.Object.create({
break;
}
try {
- if (typeof(config == "string") && config.defaultValue.indexOf("{firstHost}") >= 0) {
+ if (typeof(config.defaultValue) == "string" && config.defaultValue.indexOf("{firstHost}") >= 0) {
serviceConfigProperty.set('value', serviceConfigProperty.value.replace(new RegExp("{firstHost}"), firstHost));
serviceConfigProperty.set('defaultValue', serviceConfigProperty.defaultValue.replace(new RegExp("{firstHost}"), firstHost));
}