You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/09/04 08:52:34 UTC
ambari git commit: AMBARI-21869. Add Dismiss button on pre-upgrade
dialog (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 5230d9354 -> 7e222173b
AMBARI-21869. Add Dismiss button on pre-upgrade dialog (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/7e222173
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/7e222173
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/7e222173
Branch: refs/heads/trunk
Commit: 7e222173b74a8d8c5e69e9cbbd3bae05c67aca1f
Parents: 5230d93
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Mon Sep 4 11:52:17 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Mon Sep 4 11:52:17 2017 +0300
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 31 ++++++++------------
.../admin/stack_and_upgrade_controller_test.js | 6 ++++
2 files changed, 19 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e222173/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 7a3ec20..b0df4a4 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
@@ -1063,18 +1063,21 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
return App.ModalPopup.show({
encodeBody: false,
primary: function() {
- return isInUpgradeWizard || this.get('controller.getSupportedUpgradeError')
- ? Em.I18n.t('ok')
- : Em.I18n.t('common.proceed')
+ if ( preUpgradeShow ) return false;
+ if ( isInUpgradeWizard || this.get('controller.getSupportedUpgradeError') ) return Em.I18n.t('ok');
+ return Em.I18n.t('common.proceed');
}.property('controller.getSupportedUpgradeError'),
secondary: function() {
- return this.get('controller.getSupportedUpgradeError') ? null : Em.I18n.t('common.cancel');
+ if (preUpgradeShow) return Em.I18n.t('common.dismiss');
+ if (this.get('controller.getSupportedUpgradeError')) return null;
+ return Em.I18n.t('common.cancel');
}.property('controller.getSupportedUpgradeError'),
+ secondaryClass: preUpgradeShow ? 'btn-success' : '',
classNames: ['upgrade-options-popup'],
header: preUpgradeShow ? Em.I18n.t('admin.stackVersions.version.preUpgrade.header') : Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.header'),
controller: this,
showFooter: function() {
- return this.get('controller.isUpgradeTypesLoaded') && !preUpgradeShow;
+ return this.get('controller.isUpgradeTypesLoaded') || preUpgradeShow;
}.property('controller.isUpgradeTypesLoaded'),
bodyClass: Em.View.extend({
templateName: require('templates/main/admin/stack_upgrade/upgrade_options'),
@@ -1100,7 +1103,11 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
}.property().volatile(),
isInUpgradeWizard: isInUpgradeWizard,
showPreUpgradeChecks: App.get('supports.preUpgradeCheck') && !isInUpgradeWizard,
- versionText: self.getVersionText( preUpgradeShow, isInUpgradeWizard, version ),
+ versionText: (function () {
+ if ( preUpgradeShow ) return Em.I18n.t('admin.stackVersions.version.preUpgrade.bodyMsg.version').format(version.get('displayName'));
+ if ( isInUpgradeWizard ) return '';
+ return Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.version').format(version.get('displayName'));
+ })(),
selectMethod: function (event) {
if (isInUpgradeWizard || !event.context.get('allowed') || event.context.get('isPrecheckFailed')) return;
var selectedMethod = event.context;
@@ -1221,18 +1228,6 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
});
},
- getVersionText: function (preUpgradeShow, isInUpgradeWizard, version) {
- if ( preUpgradeShow ){
- return Em.I18n.t('admin.stackVersions.version.preUpgrade.bodyMsg.version').format(version.get('displayName'));
- }
- else{
- if ( isInUpgradeWizard ){
- return '';
- }
- return Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.version').format(version.get('displayName'));
- }
- },
-
/**
* open upgrade options from upgrade wizard
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/7e222173/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 770aae3..94b9091 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
@@ -3586,5 +3586,11 @@ describe('App.MainAdminStackAndUpgradeController', function() {
controller.showUpgradeOptions(version);
expect(controller.upgradeOptions.calledWith(false, version, true)).to.be.true;
});
+
+ it("runningCheckRequests has 1 item" + Em.I18n.t('common.dismiss'), function () {
+ var version = Em.Object.create({displayName: 'HDP-2.2'});
+ var popup = controller.upgradeOptions(false, version, true);
+ expect( controller.get('runningCheckRequests')).to.have.length(1);
+ })
});
});