Browse Source

AMBARI-9061 Rolling Upgrades: UI doesn't send repo version to API on Upgrade. (atkach)

Andrii Tkach 10 years ago
parent
commit
ec8aa75329

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

@@ -298,10 +298,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
       App.ajax.send({
         name: "admin.rolling_upgrade.pre_upgrade_check",
         sender: this,
-        data: {
-          version: version.value,
-          label: version.label
-        },
+        data: version,
         success: "runPreUpgradeCheckSuccess"
       });
     } else {

+ 1 - 1
ambari-web/app/utils/ajax/ajax.js

@@ -1379,7 +1379,7 @@ var urls = {
     'mock': ''
   },
   'admin.rolling_upgrade.pre_upgrade_check': {
-    'real': '/clusters/{clusterName}/rolling_upgrades_check?fields=*&UpgradeChecks/repository_version={version}',
+    'real': '/clusters/{clusterName}/rolling_upgrades_check?fields=*&UpgradeChecks/repository_version={value}',
     'mock': '/data/stack_versions/pre_upgrade_check.json'
   },
 

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

@@ -246,7 +246,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
         name: "admin.rolling_upgrade.pre_upgrade_check",
         sender: controller,
         data: {
-          version: '2.2',
+          value: '2.2',
           label: 'HDP-2.2'
         },
         success: "runPreUpgradeCheckSuccess"