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:07 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk e53cc68d4 -> 26427cd9a


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/26427cd9
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/26427cd9
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/26427cd9

Branch: refs/heads/trunk
Commit: 26427cd9a8fb8cb76a7dc60e48dade3720392d4f
Parents: e53cc68
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Fri Sep 15 14:31:17 2017 +0300
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Fri Sep 15 15:47:16 2017 +0300

----------------------------------------------------------------------
 .../mixins/wizard/assign_master_components.js   | 23 ++++++++++----------
 1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/26427cd9/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 7c4929f..84a56f1 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -521,16 +521,17 @@ App.AssignMasterComponents = Em.Mixin.create(App.HostComponentValidationMixin,
A
     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.getRecommendedHosts({
-      hosts: this.getHosts()
-    }).then(function() {
-      self.loadStepCallback(self.createComponentInstallationObjects(), self);
+    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.getRecommendedHosts({
+        hosts: self.getHosts()
+      }).then(function () {
+        self.loadStepCallback(self.createComponentInstallationObjects(), self);
+      });
     });
   },
 
@@ -597,7 +598,7 @@ App.AssignMasterComponents = Em.Mixin.create(App.HostComponentValidationMixin,
A
    */
   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