ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [01/30] git commit: AMBARI-7258 Slider View: FE - Make ganglia monitoring optional when creating app, second patch. (atkach)
Date Fri, 12 Sep 2014 23:53:29 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-alerts-dev 853497f8e -> aaf051357


AMBARI-7258 Slider View: FE - Make ganglia monitoring optional when creating app, second patch.
(atkach)


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

Branch: refs/heads/branch-alerts-dev
Commit: 8778556f438f35c650912ea32e375c5ba0619986
Parents: 3035978
Author: atkach <atkach@hortonworks.com>
Authored: Thu Sep 11 22:08:20 2014 +0300
Committer: atkach <atkach@hortonworks.com>
Committed: Thu Sep 11 22:08:20 2014 +0300

----------------------------------------------------------------------
 .../ui/app/controllers/createAppWizard/step3_controller.js       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/8778556f/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step3_controller.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step3_controller.js
b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step3_controller.js
index 0377388..a2eaa2e 100644
--- a/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step3_controller.js
+++ b/contrib/views/slider/src/main/resources/ui/app/controllers/createAppWizard/step3_controller.js
@@ -127,8 +127,8 @@ App.CreateAppWizardStep3Controller = Ember.ObjectController.extend({
     Object.keys(newAppConfigs).forEach(function (key) {
       var label = (!!key.match('^site.')) ? key.substr(5) : key;
       var configSetting = (configSettings[key]) ?
-        $.extend({name: key, value: configs[key], label: label}, configSettings[key]) :
-        {name: key, value: configs[key], label: label};
+        $.extend({name: key, value: newAppConfigs[key], label: label}, configSettings[key])
:
+        {name: key, value: newAppConfigs[key], label: label};
 
       if (key === "site.global.ganglia_server_host" && !!setDefaults && App.get('gangliaHost'))
{
         configSetting.value = App.get('gangliaHost');


Mime
View raw message