Repository: ambari Updated Branches: refs/heads/trunk b027837fa -> 81354ffd2
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/81354ffd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/81354ffd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/81354ffd Branch: refs/heads/trunk Commit: 81354ffd2b32f22178f98c8588974faa98a136dd Parents: b027837 Author: Alex Antonenko <[email protected]> Authored: Wed Sep 27 16:28:08 2017 +0300 Committer: Alex Antonenko <[email protected]> Committed: Wed Sep 27 16:28:08 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/81354ffd/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 b0074a9..67bde4f 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 @@ -64,7 +64,7 @@ App.UpgradeVersionColumnView = App.UpgradeVersionBoxView.extend({ }.property(), 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/81354ffd/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 e1e477d..4b54892 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; + }) }) });
