Repository: ambari Updated Branches: refs/heads/trunk c1fd867e2 -> ec8aa7532
AMBARI-9061 Rolling Upgrades: UI doesn't send repo version to API on Upgrade. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ec8aa753 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ec8aa753 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ec8aa753 Branch: refs/heads/trunk Commit: ec8aa75329d81d44cf24af8f70767c7fb43a27fc Parents: d2dd696 Author: Andrii Tkach <[email protected]> Authored: Fri Jan 9 15:36:02 2015 +0200 Committer: Andrii Tkach <[email protected]> Committed: Fri Jan 9 16:01:17 2015 +0200 ---------------------------------------------------------------------- .../app/controllers/main/admin/stack_and_upgrade_controller.js | 5 +---- ambari-web/app/utils/ajax/ajax.js | 2 +- .../controllers/main/admin/stack_and_upgrade_controller_test.js | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8aa753/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 8b97364..1629555 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 @@ -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 { http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8aa753/ambari-web/app/utils/ajax/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax/ajax.js b/ambari-web/app/utils/ajax/ajax.js index 00abbed..82e73b1 100644 --- a/ambari-web/app/utils/ajax/ajax.js +++ b/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' }, http://git-wip-us.apache.org/repos/asf/ambari/blob/ec8aa753/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 0a763b1..3f770f3 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 @@ -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"
