You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/10/03 15:07:51 UTC
ambari git commit: AMBARI-22120. Current Stack Showing 'Upgrade'
(alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 ee8018400 -> 66d2c2b1f
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/66d2c2b1
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/66d2c2b1
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/66d2c2b1
Branch: refs/heads/branch-2.6
Commit: 66d2c2b1f93748302c5a90f61b1bf350374bdb08
Parents: ee80184
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Tue Oct 3 18:07:35 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Tue Oct 3 18:07:35 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/66d2c2b1/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 478669c..63f5b35 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
@@ -258,14 +258,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/66d2c2b1/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 30cfa10..3623a53 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
@@ -549,12 +549,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
@@ -582,12 +577,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
@@ -1369,14 +1359,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