Repository: ambari Updated Branches: refs/heads/branch-2.6 45f1e6be5 -> 7021466bb
AMBARI-22071. During Upgrade the Icons Showing Required Services Is Wrong (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7021466b Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7021466b Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7021466b Branch: refs/heads/branch-2.6 Commit: 7021466bb8233912d1123491f230a08aebb0102a Parents: 45f1e6b Author: Alex Antonenko <[email protected]> Authored: Wed Sep 27 16:29:14 2017 +0300 Committer: Alex Antonenko <[email protected]> Committed: Wed Sep 27 16:29:14 2017 +0300 ---------------------------------------------------------------------- .../main/admin/stack_upgrade/upgrade_version_column_view.js | 2 +- .../admin/stack_upgrade/upgrade_version_column_view_test.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/7021466b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js index d19b437..df5240f 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js @@ -70,7 +70,7 @@ App.UpgradeVersionColumnView = App.UpgradeVersionBoxView.extend({ * @returns {boolean} */ getNotUpgradable: function(isAvailable, isUpgradable) { - return this.get('content.isMaint') && this.get('content.status') !== 'CURRENT' && isAvailable && !isUpgradable; + return this.get('content.isMaint') && !this.get('isUpgrading') && this.get('content.status') !== 'CURRENT' && isAvailable && !isUpgradable; }, /** http://git-wip-us.apache.org/repos/asf/ambari/blob/7021466b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_column_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_column_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_column_view_test.js index 50c267d..f550668 100644 --- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_column_view_test.js +++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_column_view_test.js @@ -183,5 +183,11 @@ describe('App.UpgradeVersionColumnView', function () { view.set('content', versions[3]); expect(view.getNotUpgradable(false, true)).to.be.false; }) + + it ('Should return false for maint, when service is available and not upgradable while is upgrading', function () { + view.set('content', versions[3]); + view.set('isUpgrading', true); + expect(view.getNotUpgradable(false, true)).to.be.false; + }) }) });
