ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akovale...@apache.org
Subject ambari git commit: AMBARI-21966. "Next" button on "Assign Masters" page gets disabled when installing Ambari (akovalenko)
Date Fri, 15 Sep 2017 12:53:36 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.6 d327aecee -> e0879e98e


AMBARI-21966. "Next" button on "Assign Masters" page gets disabled when installing Ambari
 (akovalenko)


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

Branch: refs/heads/branch-2.6
Commit: e0879e98ec4c719cf36346dd8e2825fbb38b754a
Parents: d327aec
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Fri Sep 15 14:14:21 2017 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Fri Sep 15 15:53:27 2017 +0300

----------------------------------------------------------------------
 .../app/mixins/wizard/assign_master_components.js | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/e0879e98/ambari-web/app/mixins/wizard/assign_master_components.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/mixins/wizard/assign_master_components.js b/ambari-web/app/mixins/wizard/assign_master_components.js
index 5da9a13..d84399e 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -551,17 +551,19 @@ App.AssignMasterComponents = Em.Mixin.create({
    * @method loadStep
    */
   loadStep: function () {
+    var self = this;
     this.clearStep();
     if (this._additionalClearSteps) {
       this._additionalClearSteps();
     }
-    this.renderHostInfo();
-    //when returning from step Assign Slaves and Clients, recommendations are already available
-    //set the flag so that recommendations AJAX call is not made unnecessarily
-    if (this.get('recommendations')) {
-      this.set('backFromNextStep',true);
-    }
-    this.loadComponentsRecommendationsFromServer(this.loadStepCallback);
+    this.renderHostInfo().done(function () {
+      //when returning from step Assign Slaves and Clients, recommendations are already available
+      //set the flag so that recommendations AJAX call is not made unnecessarily
+      if (self.get('recommendations')) {
+        self.set('backFromNextStep', true);
+      }
+      self.loadComponentsRecommendationsFromServer(self.loadStepCallback);
+    });
   },
 
   /**
@@ -627,7 +629,7 @@ App.AssignMasterComponents = Em.Mixin.create({
    */
   renderHostInfo: function () {
     var isInstaller = (this.get('wizardController.name') === 'installerController' || this.get('content.controllerName')
=== 'installerController');
-    App.ajax.send({
+    return App.ajax.send({
       name: isInstaller ? 'hosts.info.install' : 'hosts.high_availability.wizard',
       sender: this,
       data: {


Mime
View raw message