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/01/21 16:58:25 UTC
ambari git commit: AMBARI-9236 Rolling Upgrade: sort order gets
reversed after dismissing and clicking on "Upgrade: In Process" link.
(atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk 153705a65 -> 9c82bd8a3
AMBARI-9236 Rolling Upgrade: sort order gets reversed after dismissing and clicking on "Upgrade: In Process" link. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9c82bd8a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9c82bd8a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9c82bd8a
Branch: refs/heads/trunk
Commit: 9c82bd8a3db14942d6937bcc229221ee2651d780
Parents: 153705a
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Wed Jan 21 17:33:51 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Wed Jan 21 17:58:16 2015 +0200
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 2 ++
.../admin/stack_upgrade/upgrade_wizard_view.js | 8 +-----
.../admin/stack_and_upgrade_controller_test.js | 28 +++++++++++++++++---
3 files changed, 28 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c82bd8a/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 365a89f..232826d 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
@@ -243,9 +243,11 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
oldItem.set('tasks', tasks);
upgradeItems.pushObject(oldItem);
});
+ upgradeItems.reverse();
oldGroup.set('upgradeItems', upgradeItems);
upgradeGroups.pushObject(oldGroup);
});
+ upgradeGroups.reverse();
this.set('upgradeData', Em.Object.create({
upgradeGroups: upgradeGroups,
Upgrade: newData.Upgrade
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c82bd8a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
index 80727cc..630a962 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
@@ -78,13 +78,7 @@ App.upgradeWizardView = Em.View.extend({
* @type {Array}
*/
upgradeGroups: function () {
- if (Em.isNone(this.get('controller.upgradeData.upgradeGroups'))) return [];
- var upgradeGroups = this.get('controller.upgradeData.upgradeGroups');
- upgradeGroups.forEach(function (group) {
- group.get('upgradeItems').reverse();
- });
- upgradeGroups.reverse();
- return upgradeGroups;
+ return this.get('controller.upgradeData.upgradeGroups') || [];
}.property('controller.upgradeData.upgradeGroups'),
/**
http://git-wip-us.apache.org/repos/asf/ambari/blob/9c82bd8a/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 cd9703c..7aeae36 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
@@ -359,16 +359,38 @@ describe('App.MainAdminStackAndUpgradeController', function() {
}
}
]
+ },
+ {
+ UpgradeItem: {
+ stage_id: 2
+ },
+ tasks: [
+ {
+ Tasks: {
+ id: 2
+ }
+ }
+ ]
}
]
+ },
+ {
+ UpgradeGroup: {
+ group_id: 2
+ },
+ upgrade_items: [
+
+ ]
}
]
};
controller.initUpgradeData(newData);
expect(controller.get('upgradeData.Upgrade.request_id')).to.equal(1);
- expect(controller.get('upgradeData.upgradeGroups')[0].get('group_id')).to.equal(1);
- expect(controller.get('upgradeData.upgradeGroups')[0].get('upgradeItems')[0].get('stage_id')).to.equal(1);
- expect(controller.get('upgradeData.upgradeGroups')[0].get('upgradeItems')[0].get('tasks')[0].get('id')).to.equal(1);
+ expect(controller.get('upgradeData.upgradeGroups')[0].get('group_id')).to.equal(2);
+ expect(controller.get('upgradeData.upgradeGroups')[1].get('group_id')).to.equal(1);
+ expect(controller.get('upgradeData.upgradeGroups')[1].get('upgradeItems')[0].get('stage_id')).to.equal(2);
+ expect(controller.get('upgradeData.upgradeGroups')[1].get('upgradeItems')[1].get('stage_id')).to.equal(1);
+ expect(controller.get('upgradeData.upgradeGroups')[1].get('upgradeItems')[0].get('tasks')[0].get('id')).to.equal(2);
});
});