Browse Source

AMBARI-12879. Warn the user about HDFS Upgrade not finalized in Ambari Web UI <fix3> (rzang)

Richard Zang 9 years ago
parent
commit
e1f697a866

+ 1 - 1
ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js

@@ -849,7 +849,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'));
   },
 

+ 10 - 6
ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js

@@ -1169,14 +1169,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"
+                    }
+                  }
+                ]
               }
             ]
           }