Repository: ambari Updated Branches: refs/heads/branch-2.4 d82176681 -> afa508f3c
AMBARI-17160. Extra spinner on assign masters (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/afa508f3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/afa508f3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/afa508f3 Branch: refs/heads/branch-2.4 Commit: afa508f3c5b4c759955b6c432d24e12820fd5f93 Parents: d821766 Author: Oleg Nechiporenko <[email protected]> Authored: Fri Jun 10 11:31:34 2016 +0300 Committer: Oleg Nechiporenko <[email protected]> Committed: Fri Jun 10 11:31:34 2016 +0300 ---------------------------------------------------------------------- ambari-web/app/templates/common/assign_master_components.hbs | 7 ++----- .../main/service/reassign/step6_controller_test.js | 8 ++++---- 2 files changed, 6 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/afa508f3/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 7d61bc3..1030405 100644 --- a/ambari-web/app/templates/common/assign_master_components.hbs +++ b/ambari-web/app/templates/common/assign_master_components.hbs @@ -148,17 +148,14 @@ {{/if}} </button> {{/if}} - <a class="btn btn-success pull-right" {{bindAttr disabled="submitDisabled"}} {{action submit target="controller"}}> + <button type="button" class="btn btn-success pull-right" {{bindAttr disabled="App.router.btnClickInProgress"}} {{action submit target="controller"}}> {{#if App.router.nextBtnClickInProgress}} {{view App.SpinnerView tagName="span" classNames="service-button-spinner"}} {{/if}} {{view.acceptButtonText}} - </a> + </button> {{#if view.isCancelButtonVisible}} <button class="btn pull-right mrm" {{action onCancel target="controller"}}>{{t common.cancel}}</button> {{/if}} - {{#if App.router.nextBtnClickInProgress}} - {{view App.SpinnerView tagName="span" classNames="pull-right"}} - {{/if}} </div> </div> http://git-wip-us.apache.org/repos/asf/ambari/blob/afa508f3/ambari-web/test/controllers/main/service/reassign/step6_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/main/service/reassign/step6_controller_test.js b/ambari-web/test/controllers/main/service/reassign/step6_controller_test.js index f5029a8..d155c01 100644 --- a/ambari-web/test/controllers/main/service/reassign/step6_controller_test.js +++ b/ambari-web/test/controllers/main/service/reassign/step6_controller_test.js @@ -174,9 +174,9 @@ describe('App.ReassignMasterWizardStep6Controller', function () { hostComponentStub.restore(); }); - var setUpHosts = function (pxfHosts, dataNodeHosts) { - hostComponentStub.withArgs('componentName', 'PXF').returns(pxfHosts); - hostComponentStub.withArgs('componentName', 'DATANODE').returns(dataNodeHosts); + var setUpHosts = function (_pxfHosts, _dataNodeHosts) { + hostComponentStub.withArgs('componentName', 'PXF').returns(_pxfHosts); + hostComponentStub.withArgs('componentName', 'DATANODE').returns(_dataNodeHosts); }; it('does not delete PXF from source host if PXF and DATANODE are not installed on the source host', function () { @@ -228,7 +228,7 @@ describe('App.ReassignMasterWizardStep6Controller', function () { setUpHosts(pxfHosts, []); controller.loadStep(); - expect(controller.get('commands').indexOf('installPxf')).to.eql(4); + expect(controller.get('commands').indexOf('installPxf')).to.be.equal(4); }); });
