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/09/29 17:11:46 UTC
ambari git commit: AMBARI-22097. Revert option is missing when MAINT
type PU is done (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 5433e4792 -> 312baa26d
AMBARI-22097. Revert option is missing when MAINT type PU is done (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/312baa26
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/312baa26
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/312baa26
Branch: refs/heads/branch-2.6
Commit: 312baa26ddbb9b405dd2f317d8534c805adf0af2
Parents: 5433e47
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Fri Sep 29 20:11:30 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Fri Sep 29 20:11:30 2017 +0300
----------------------------------------------------------------------
.../main/admin/stack_upgrade/upgrade_version_box_view.js | 3 ++-
.../admin/stack_upgrade/upgrade_version_box_view_test.js | 11 +++++++++--
2 files changed, 11 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/312baa26/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 28d61ec..0e71fa6 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
@@ -167,9 +167,10 @@ App.UpgradeVersionBoxView = Em.View.extend({
});
var isSuspended = App.get('upgradeSuspended');
+ element.set('canBeReverted', this.get('content.stackVersion').get('supportsRevert'));
+
if (status === 'CURRENT' && this.get('content.isPatch') && !this.get('isUpgrading')) {
element.setProperties(statePropertiesMap['CURRENT_PATCH']);
- element.set('canBeReverted', this.get('content.stackVersion').get('supportsRevert'));
}
else if (['INSTALLING'].contains(status)) {
element.setProperties(statePropertiesMap[status]);
http://git-wip-us.apache.org/repos/asf/ambari/blob/312baa26/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 3e9fa73..2f9f76e 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
@@ -153,6 +153,7 @@ describe('App.UpgradeVersionBoxView', function () {
jQueryMock;
beforeEach(function () {
sinon.stub(view.get('controller'), 'upgrade').returns(1);
+ view.set('content.stackVersion', Em.Object.create({supportsRevert: false}))
jQueryMock = sinon.stub(window, '$');
});
afterEach(function () {
@@ -170,12 +171,15 @@ describe('App.UpgradeVersionBoxView', function () {
expect(view.get('controller').upgrade.calledWith('content')).to.be.true;
});
it("action is taken from stateElement", function () {
+ var content = Em.Object.create({
+ stackVersion: Em.Object.create({supportsRevert: false}),
+ });
view.setProperties({
- 'content': 'content',
+ 'content': content,
'stateElement.action': 'upgrade'
});
view.runAction();
- expect(view.get('controller').upgrade.calledWith('content')).to.be.true;
+ expect(view.get('controller').upgrade.calledWith(content)).to.be.true;
});
it("link is disabled", function () {
jQueryMock.returns({
@@ -351,6 +355,9 @@ describe('App.UpgradeVersionBoxView', function () {
});
describe('#stateElement', function () {
+ beforeEach(function () {
+ view.set('content.stackVersion', Em.Object.create({supportsRevert: false}))
+ });
var cases = [
{