ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ababiic...@apache.org
Subject ambari git commit: AMBARI-17268 Next button on Assign Masters page sometimes doesn't work. (ababiichuk)
Date Thu, 16 Jun 2016 09:09:02 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk a301994f5 -> 5f1c6a58d


AMBARI-17268 Next button on Assign Masters page sometimes doesn't work. (ababiichuk)


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

Branch: refs/heads/trunk
Commit: 5f1c6a58dc054d39f418f58c3b278abe20ef7c9e
Parents: a301994
Author: ababiichuk <ababiichuk@hortonworks.com>
Authored: Thu Jun 16 11:19:33 2016 +0300
Committer: ababiichuk <ababiichuk@hortonworks.com>
Committed: Thu Jun 16 12:08:27 2016 +0300

----------------------------------------------------------------------
 ambari-web/app/mixins/wizard/assign_master_components.js       | 2 ++
 ambari-web/app/templates/common/assign_master_components.hbs   | 2 +-
 ambari-web/test/mixins/wizard/assign_master_components_test.js | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/5f1c6a58/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 1ed649b..e7779c4 100644
--- a/ambari-web/app/mixins/wizard/assign_master_components.js
+++ b/ambari-web/app/mixins/wizard/assign_master_components.js
@@ -1153,6 +1153,8 @@ App.AssignMasterComponents = Em.Mixin.create({
     }
   },
 
+  nextButtonDisabled: Em.computed.or('App.router.btnClickInProgress', 'submitDisabled'),
+
   /**
    * Submit button click handler
    * Disable 'Next' button while it is already under process. (using Router's property 'nextBtnClickInProgress')

http://git-wip-us.apache.org/repos/asf/ambari/blob/5f1c6a58/ambari-web/app/templates/common/assign_master_components.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/assign_master_components.hbs b/ambari-web/app/templates/common/assign_master_components.hbs
index 1030405..17763ca 100644
--- a/ambari-web/app/templates/common/assign_master_components.hbs
+++ b/ambari-web/app/templates/common/assign_master_components.hbs
@@ -148,7 +148,7 @@
         {{/if}}
       </button>
     {{/if}}
-    <button type="button" class="btn btn-success pull-right" {{bindAttr disabled="App.router.btnClickInProgress"}}
{{action submit target="controller"}}>
+    <button type="button" class="btn btn-success pull-right" {{bindAttr disabled="nextButtonDisabled"}}
{{action submit target="controller"}}>
       {{#if App.router.nextBtnClickInProgress}}
         {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}}
       {{/if}}

http://git-wip-us.apache.org/repos/asf/ambari/blob/5f1c6a58/ambari-web/test/mixins/wizard/assign_master_components_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/mixins/wizard/assign_master_components_test.js b/ambari-web/test/mixins/wizard/assign_master_components_test.js
index d746f86..eb48ad5 100644
--- a/ambari-web/test/mixins/wizard/assign_master_components_test.js
+++ b/ambari-web/test/mixins/wizard/assign_master_components_test.js
@@ -209,4 +209,8 @@ describe('App.AssignMasterComponents', function () {
     });
 
   });
+
+  App.TestAliases.testAsComputedOr(baseObject.create(),
+    'nextButtonDisabled', ['App.router.btnClickInProgress', 'submitDisabled']);
+
 });
\ No newline at end of file


Mime
View raw message