ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rz...@apache.org
Subject ambari git commit: AMBARI-12879. Warn the user about HDFS Upgrade not finalized in Ambari Web UI <fix3> (rzang)
Date Wed, 23 Sep 2015 21:13:28 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.1.2 1464453f6 -> 8c05e3b35


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/8c05e3b3
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8c05e3b3
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8c05e3b3

Branch: refs/heads/branch-2.1.2
Commit: 8c05e3b35794a9c9ca526a9f7ae53024eaee3514
Parents: 1464453
Author: Richard Zang <rzang@apache.org>
Authored: Wed Sep 23 14:07:51 2015 -0700
Committer: Richard Zang <rzang@apache.org>
Committed: Wed Sep 23 14:12:02 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/8c05e3b3/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/8c05e3b3/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"
+                    }
+                  }
+                ]
               }
             ]
           }


Mime
View raw message