AMBARI-22120. Current Stack Showing 'Upgrade' (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/11707ba5 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/11707ba5 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/11707ba5 Branch: refs/heads/branch-feature-AMBARI-14714 Commit: 11707ba5d40c5cab170c14cfbc5ef955ff89656a Parents: 1032bc5 Author: Alex Antonenko <[email protected]> Authored: Tue Oct 3 18:08:30 2017 +0300 Committer: Alex Antonenko <[email protected]> Committed: Tue Oct 3 18:08:30 2017 +0300 ---------------------------------------------------------------------- .../stack_upgrade/upgrade_version_box_view.js | 7 +----- .../upgrade_version_box_view_test.js | 24 ++++---------------- 2 files changed, 5 insertions(+), 26 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/11707ba5/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js index 212ef3d..81049e9 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js @@ -265,14 +265,9 @@ App.UpgradeVersionBoxView = Em.View.extend({ if (Em.get(currentVersion, 'stack_name') !== this.get('content.stackVersionType') || isVersionHigherThanCurrent) { switch (status){ case 'OUT_OF_SYNC': - element.set('isButtonGroup', true); + element.set('isButton', true); element.set('text', this.get('isVersionColumnView') ? Em.I18n.t('common.reinstall') : Em.I18n.t('admin.stackVersions.version.reinstall')); element.set('action', 'installRepoVersionPopup'); - element.get('buttons').pushObject({ - text: this.get('isVersionColumnView') ? Em.I18n.t('common.upgrade') : Em.I18n.t('admin.stackVersions.version.performUpgrade'), - action: 'confirmUpgrade', - isDisabled: isDisabled - }); break; case 'INSTALL_FAILED': element.set('isButton', true); http://git-wip-us.apache.org/repos/asf/ambari/blob/11707ba5/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js index 854e734..5a8f135 100644 --- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js +++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js @@ -624,12 +624,7 @@ describe('App.UpgradeVersionBoxView', function () { }, expected: { status: 'OUT_OF_SYNC', - isButtonGroup: true, - buttons: [{ - text: Em.I18n.t('admin.stackVersions.version.performUpgrade'), - action: 'confirmUpgrade', - isDisabled: false - }], + isButton: true, text: Em.I18n.t('admin.stackVersions.version.reinstall'), action: 'installRepoVersionPopup', isDisabled: false @@ -657,12 +652,7 @@ describe('App.UpgradeVersionBoxView', function () { }, expected: { status: 'OUT_OF_SYNC', - isButtonGroup: true, - buttons: [{ - text: Em.I18n.t('admin.stackVersions.version.performUpgrade'), - action: 'confirmUpgrade', - isDisabled: true - }], + isButton: true, text: Em.I18n.t('admin.stackVersions.version.reinstall'), action: 'installRepoVersionPopup', isDisabled: true @@ -1399,14 +1389,8 @@ describe('App.UpgradeVersionBoxView', function () { }); view.processPreUpgradeState(element); expect(JSON.stringify(element)).to.be.equal(JSON.stringify(Em.Object.create({ - "buttons": [ - { - "text": Em.I18n.t('admin.stackVersions.version.performUpgrade'), - "action": "confirmUpgrade", - "isDisabled": false - } - ], - "isButtonGroup": true, + "buttons": [], + "isButton": true, "text": Em.I18n.t('admin.stackVersions.version.reinstall'), "action": 'installRepoVersionPopup', "isDisabled": false
