You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2016/06/16 09:05:18 UTC
ambari git commit: AMBARI-17268 Next button on Assign Masters page
sometimes doesn't work. (ababiichuk)
Repository: ambari
Updated Branches:
refs/heads/branch-2.4 39e43cebf -> f1c4211ad
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/f1c4211a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/f1c4211a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/f1c4211a
Branch: refs/heads/branch-2.4
Commit: f1c4211ad6318fed29814e5ef8ee6c8cc9b4e4fc
Parents: 39e43ce
Author: ababiichuk <ab...@hortonworks.com>
Authored: Thu Jun 16 11:19:33 2016 +0300
Committer: ababiichuk <ab...@hortonworks.com>
Committed: Thu Jun 16 11:30:55 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/f1c4211a/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/f1c4211a/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/f1c4211a/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