ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From atk...@apache.org
Subject git commit: AMBARI-4211 Empty content of review step in Add Host wizard. (atkach)
Date Thu, 02 Jan 2014 17:38:05 GMT
Updated Branches:
  refs/heads/branch-1.4.3 90f28ade2 -> 3f6e460e4


AMBARI-4211 Empty content of review step in Add Host wizard. (atkach)


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

Branch: refs/heads/branch-1.4.3
Commit: 3f6e460e4dc75996838fcf383c3e0ba2b2dffd99
Parents: 90f28ad
Author: atkach <atkach@hortonworks.com>
Authored: Thu Jan 2 19:37:49 2014 +0200
Committer: atkach <atkach@hortonworks.com>
Committed: Thu Jan 2 19:38:02 2014 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step8_controller.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/3f6e460e/ambari-web/app/controllers/wizard/step8_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step8_controller.js b/ambari-web/app/controllers/wizard/step8_controller.js
index aa2f37f..7889cfa 100644
--- a/ambari-web/app/controllers/wizard/step8_controller.js
+++ b/ambari-web/app/controllers/wizard/step8_controller.js
@@ -82,9 +82,11 @@ App.WizardStep8Controller = Em.Controller.extend({
       this.set('securityEnabled', App.router.get('mainAdminSecurityController').getUpdatedSecurityStatus());
     }
     this.clearStep();
-    this.formatProperties();
-    this.loadGlobals();
-    this.loadConfigs();
+    if (this.get('content.serviceConfigProperties')) {
+      this.formatProperties();
+      this.loadGlobals();
+      this.loadConfigs();
+    }
     this.loadClusterInfo();
     this.loadServices();
     this.set('isSubmitDisabled', false);


Mime
View raw message