You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ja...@apache.org on 2017/09/20 00:39:05 UTC
ambari git commit: Revert "AMBARI-21966. "Next" button on "Assign
Masters" page gets disabled when installing Ambari (akovalenko)"
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 3e8ba2a1f -> 1140bbc07
Revert "AMBARI-21966. "Next" button on "Assign Masters" page gets disabled when installing Ambari (akovalenko)"
This reverts commit e0879e98ec4c719cf36346dd8e2825fbb38b754a.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/1140bbc0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/1140bbc0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/1140bbc0
Branch: refs/heads/branch-2.6
Commit: 1140bbc077aa96df395a06a15c18cd281a3839e3
Parents: 3e8ba2a
Author: Jaimin Jetly <ja...@hortonworks.com>
Authored: Tue Sep 19 17:38:31 2017 -0700
Committer: Jaimin Jetly <ja...@hortonworks.com>
Committed: Tue Sep 19 17:38:31 2017 -0700
----------------------------------------------------------------------
.../app/mixins/wizard/assign_master_components.js | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/1140bbc0/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 d84399e..5da9a13 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -551,19 +551,17 @@ App.AssignMasterComponents = Em.Mixin.create({
* @method loadStep
*/
loadStep: function () {
- var self = this;
this.clearStep();
if (this._additionalClearSteps) {
this._additionalClearSteps();
}
- 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);
- });
+ 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);
},
/**
@@ -629,7 +627,7 @@ App.AssignMasterComponents = Em.Mixin.create({
*/
renderHostInfo: function () {
var isInstaller = (this.get('wizardController.name') === 'installerController' || this.get('content.controllerName') === 'installerController');
- return App.ajax.send({
+ App.ajax.send({
name: isInstaller ? 'hosts.info.install' : 'hosts.high_availability.wizard',
sender: this,
data: {