You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2015/01/09 15:01:45 UTC
[1/2] ambari git commit: AMBARI-9061 Rolling Upgrades: UI doesn't
send repo version to API on Upgrade. (atkach)
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 <at...@hortonworks.com>
Authored: Fri Jan 9 15:36:02 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
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"
[2/2] ambari git commit: AMBARI-9060 Upgrade Progress Popup: add
Dismiss button in the footer and remove confirmation popup on hitting X.
(atkach)
Posted by at...@apache.org.
AMBARI-9060 Upgrade Progress Popup: add Dismiss button in the footer and remove confirmation popup on hitting X. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d2dd6962
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d2dd6962
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d2dd6962
Branch: refs/heads/trunk
Commit: d2dd6962a05fa7237973ba913185e519f2e94931
Parents: c1fd867
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Fri Jan 9 15:25:49 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Fri Jan 9 16:01:17 2015 +0200
----------------------------------------------------------------------
ambari-web/app/routes/stack_upgrade_routes.js | 28 +++++-----------------
1 file changed, 6 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d2dd6962/ambari-web/app/routes/stack_upgrade_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/stack_upgrade_routes.js b/ambari-web/app/routes/stack_upgrade_routes.js
index eddc2d2..be0f7e5 100644
--- a/ambari-web/app/routes/stack_upgrade_routes.js
+++ b/ambari-web/app/routes/stack_upgrade_routes.js
@@ -32,7 +32,7 @@ module.exports = App.WizardRoute.extend({
return Em.I18n.t('admin.stackUpgrade.dialog.header').format(App.router.get('mainAdminStackAndUpgradeController').get('upgradeVersion'));
}.property('App.router.mainAdminStackAndUpgradeController.upgradeVersion'),
bodyClass: App.upgradeWizardView,
- primary: null,
+ primary: Em.I18n.t('common.dismiss'),
secondary: null,
didInsertElement: function () {
this.fitHeight();
@@ -49,27 +49,11 @@ module.exports = App.WizardRoute.extend({
scrollable.css('max-height', Number(block.css('max-height').slice(0, -2)) - block.height());
block.css('max-height', 'none');
},
- onClose: function() {
- var self = this, header, body;
- if (['IN_PROGRESS', 'PENDING', 'FAILED'].contains(App.get('upgradeState'))) {
- header = Em.I18n.t('admin.stackUpgrade.state.inProgress');
- body = Em.I18n.t('admin.stackUpgrade.dialog.closeProgress');
- } else if (App.get('upgradeState') === 'HOLDING') {
- header = Em.I18n.t('admin.stackUpgrade.state.paused');
- body = Em.I18n.t('admin.stackUpgrade.dialog.closePause');
- } else {
- this.closeWizard();
- return;
- }
- App.ModalPopup.show({
- header: header,
- body: body,
- showCloseButton: false,
- onPrimary: function() {
- self.closeWizard();
- this._super();
- }
- })
+ onPrimary: function () {
+ this.closeWizard();
+ },
+ onClose: function () {
+ this.closeWizard();
},
closeWizard: function () {
App.router.get('updateController').set('isWorking', true);