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-14748. Unable to proceed Assign Slaves step (akovalenko)
Date Fri, 22 Jan 2016 12:33:16 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk 8177bbb2d -> 277677746


AMBARI-14748. Unable to proceed Assign Slaves step (akovalenko)


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

Branch: refs/heads/trunk
Commit: 277677746a3a6fe72fa073d450aa92b648d2a7d8
Parents: 8177bbb
Author: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Authored: Wed Jan 20 22:55:30 2016 +0200
Committer: Aleksandr Kovalenko <akovalenko@hortonworks.com>
Committed: Fri Jan 22 14:31:57 2016 +0200

----------------------------------------------------------------------
 ambari-web/app/controllers/wizard/step6_controller.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/27767774/ambari-web/app/controllers/wizard/step6_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/wizard/step6_controller.js b/ambari-web/app/controllers/wizard/step6_controller.js
index ffa5cc9..d3f73ef 100644
--- a/ambari-web/app/controllers/wizard/step6_controller.js
+++ b/ambari-web/app/controllers/wizard/step6_controller.js
@@ -71,7 +71,7 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin, {
    * Define state for submit button
    * @type {bool}
    */
-  submitDisabled: false,
+  submitDisabled: Em.computed.alias('validationInProgress'),
 
   /**
    * timer for validation request
@@ -562,13 +562,13 @@ App.WizardStep6Controller = Em.Controller.extend(App.BlueprintMixin,
{
   callValidation: function (successCallback) {
     var self = this;
     clearTimeout(this.get('timer'));
-    this.set('timer', setTimeout(function() {
-      if (self.get('validationInProgress')) {
+    if (this.get('validationInProgress')) {
+      this.set('timer', setTimeout(function () {
         self.callValidation(successCallback);
-      } else {
-        self.callServerSideValidation(successCallback);
-      }
-    }, 700));
+      }, 700));
+    } else {
+      this.callServerSideValidation(successCallback);
+    }
   },
 
   /**


Mime
View raw message