You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2015/10/30 15:25:49 UTC
ambari git commit: AMBARI-13659 Downgrade button was absent in manual
step prompts during RU. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 faf916680 -> fe53ca131
AMBARI-13659 Downgrade button was absent in manual step prompts during RU. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/fe53ca13
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/fe53ca13
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/fe53ca13
Branch: refs/heads/branch-2.1
Commit: fe53ca13181c42d45c8dc59157eee4b6bb701adc
Parents: faf9166
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Fri Oct 30 16:09:11 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Fri Oct 30 16:25:29 2015 +0200
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 6 ++++--
ambari-web/app/utils/ajax/ajax.js | 2 +-
.../main/admin/stack_and_upgrade_controller_test.js | 11 ++++++++++-
3 files changed, 15 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe53ca13/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index 266c8ce..79b3432 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -53,9 +53,9 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
/**
* @type {boolean}
- * @default null
+ * @default true
*/
- downgradeAllowed: null,
+ downgradeAllowed: true,
/**
* @type {string}
@@ -392,6 +392,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
upgradeGroups: upgradeGroups,
Upgrade: newData.Upgrade
}));
+ this.set('downgradeAllowed', newData.Upgrade.downgrade_allowed);
+ this.setDBProperty('downgradeAllowed', newData.Upgrade.downgrade_allowed);
},
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe53ca13/ambari-web/app/utils/ajax/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js
index 850b23b..3e0298b 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1556,7 +1556,7 @@ var urls = {
},
'admin.upgrade.data': {
'real': '/clusters/{clusterName}/upgrades/{id}?upgrade_groups/UpgradeGroup/status!=PENDING&fields=' +
- 'Upgrade/progress_percent,Upgrade/request_context,Upgrade/request_status,Upgrade/direction,' +
+ 'Upgrade/progress_percent,Upgrade/request_context,Upgrade/request_status,Upgrade/direction,Upgrade/downgrade_allowed,' +
'upgrade_groups/UpgradeGroup,' +
'upgrade_groups/upgrade_items/UpgradeItem/status,' +
'upgrade_groups/upgrade_items/UpgradeItem/context,' +
http://git-wip-us.apache.org/repos/asf/ambari/blob/fe53ca13/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index 67fc368..183dda8 100644
--- a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -650,10 +650,17 @@ describe('App.MainAdminStackAndUpgradeController', function() {
});
describe("#initUpgradeData()", function() {
+ beforeEach(function () {
+ sinon.stub(controller, 'setDBProperty');
+ });
+ afterEach(function () {
+ controller.setDBProperty.restore();
+ });
it("", function() {
var newData = {
Upgrade: {
- request_id: 1
+ request_id: 1,
+ downgrade_allowed: false
},
upgrade_groups: [
{
@@ -702,6 +709,8 @@ describe('App.MainAdminStackAndUpgradeController', function() {
]
};
controller.initUpgradeData(newData);
+ expect(controller.setDBProperty.calledWith('downgradeAllowed', false)).to.be.true;
+ expect(controller.get('downgradeAllowed')).to.be.false;
expect(controller.get('upgradeData.Upgrade.request_id')).to.equal(1);
expect(controller.get('upgradeData.upgradeGroups')[0].get('group_id')).to.equal(3);
expect(controller.get('upgradeData.upgradeGroups')[1].get('group_id')).to.equal(2);