ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject git commit: AMBARI-2830. Going back to Customize Services page from the Install page resets default directory values to empty string. (Andrii Babiichuk via yusaku)
Date Wed, 07 Aug 2013 18:16:47 GMT
Updated Branches:
  refs/heads/trunk c3591ec0b -> afc574e8b


AMBARI-2830. Going back to Customize Services page from the Install page resets default directory
values to empty string. (Andrii Babiichuk via yusaku)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/afc574e8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/afc574e8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/afc574e8

Branch: refs/heads/trunk
Commit: afc574e8b4ebfaec65a83c5ff81d0e98a362bc92
Parents: c3591ec
Author: Yusaku Sako <yusaku@hortonworks.com>
Authored: Wed Aug 7 11:16:26 2013 -0700
Committer: Yusaku Sako <yusaku@hortonworks.com>
Committed: Wed Aug 7 11:16:26 2013 -0700

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard.js | 2 +-
 ambari-web/app/utils/config.js       | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/afc574e8/ambari-web/app/controllers/wizard.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard.js b/ambari-web/app/controllers/wizard.js
index 6daae4f..b8cec06 100644
--- a/ambari-web/app/controllers/wizard.js
+++ b/ambari-web/app/controllers/wizard.js
@@ -700,7 +700,7 @@ App.WizardController = Em.Controller.extend({
       _content.get('configs').forEach(function (_configProperties) {
         var displayType = _configProperties.get('displayType');
         if (displayType === 'directories' || displayType === 'directory') {
-          var value = _configProperties.get('value').trim().split(/\s+/g).join(',');
+          var value = _configProperties.get('value').split(/\s+/g).join(',');
           _configProperties.set('value', value);
         }
         var overrides = _configProperties.get('overrides');

http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/afc574e8/ambari-web/app/utils/config.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js
index 4186e59..f4be308 100644
--- a/ambari-web/app/utils/config.js
+++ b/ambari-web/app/utils/config.js
@@ -258,6 +258,7 @@ App.config = Em.Object.create({
       if (preDefined && stored) {
         configData = preDefined;
         configData.value = stored.value;
+        configData.defaultValue = stored.defaultValue;
         configData.overrides = stored.overrides;
       } else if (!preDefined && stored) {
         configData = {


Mime
View raw message