You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by rz...@apache.org on 2015/09/23 23:11:28 UTC
ambari git commit: AMBARI-12879. Warn the user about HDFS Upgrade not
finalized in Ambari Web UI (rzang)
Repository: ambari
Updated Branches:
refs/heads/branch-2.1 bc53787f2 -> 21cf242b5
AMBARI-12879. Warn the user about HDFS Upgrade not finalized in Ambari Web UI <fix3> (rzang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/21cf242b
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/21cf242b
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/21cf242b
Branch: refs/heads/branch-2.1
Commit: 21cf242b5edc9b1b46c839c5f05c3f54b081dd21
Parents: bc53787
Author: Richard Zang <rz...@apache.org>
Authored: Wed Sep 23 14:07:51 2015 -0700
Committer: Richard Zang <rz...@apache.org>
Committed: Wed Sep 23 14:10:00 2015 -0700
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 2 +-
.../main/admin/stack_and_upgrade_controller_test.js | 16 ++++++++++------
2 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/21cf242b/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 ddca7f1..97910b7 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
@@ -837,7 +837,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
* @method updateFinalizeSuccessCallback
*/
updateFinalizeSuccessCallback: function (data) {
- var context = data ? Em.get(data, 'upgrade_groups.firstObject.upgrade_items.firstObject.UpgradeItem.context') : '';
+ var context = data ? Em.get(data, 'items.firstObject.upgrade_groups.firstObject.upgrade_items.firstObject.UpgradeItem.context') : '';
this.set('isFinalizeItem', context === this.get('finalizeContext'));
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/21cf242b/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 253ef80..e0e2ff0 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
@@ -1154,14 +1154,18 @@ describe('App.MainAdminStackAndUpgradeController', function() {
it('data exists and Finalize should be true', function() {
var data = {
- upgrade_groups: [
+ items: [
{
- upgrade_items: [
+ upgrade_groups: [
{
- UpgradeItem: {
- context: controller.get('finalizeContext'),
- status: "HOLDING"
- }
+ upgrade_items: [
+ {
+ UpgradeItem: {
+ context: controller.get('finalizeContext'),
+ status: "HOLDING"
+ }
+ }
+ ]
}
]
}