You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/10/19 15:54:00 UTC
[14/50] [abbrv] ambari git commit: AMBARI-13393-2. Express Upgrade:
UX changes for upgrade method selections window.(xiwang)
AMBARI-13393-2. Express Upgrade: UX changes for upgrade method selections window.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/716e2580
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/716e2580
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/716e2580
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 716e25803d686a5d466ef8350404c9676509051d
Parents: 520e41f
Author: Xi Wang <xi...@apache.org>
Authored: Wed Oct 14 18:58:38 2015 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Thu Oct 15 12:43:25 2015 -0700
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 24 ++++++++++----------
ambari-web/app/styles/stack_versions.less | 16 ++++++-------
2 files changed, 20 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/716e2580/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 8998055..6a94e6e 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
@@ -92,7 +92,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
}),
Em.Object.create({
displayName: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.EU.title'),
- type: 'NON-ROLLING',
+ type: 'NON_ROLLING',
icon: "icon-bolt",
description: Em.I18n.t('admin.stackVersions.version.upgrade.upgradeOptions.EU.description'),
selected: false,
@@ -512,8 +512,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
var upgradeTypeDisplayName = upgradeMethod ? upgradeMethod.get('displayName') : null;
this.set('upgradeTypeDisplayName', upgradeTypeDisplayName);
this.set('failuresTolerance', Em.Object.create({
- skipComponentFailures: params.skipComponentFailures,
- skipSCFailures: params.skipSCFailures
+ skipComponentFailures: params.skipComponentFailures == 'true',
+ skipSCFailures: params.skipSCFailures == 'true'
}));
this.setDBProperties({
upgradeVersion: params.label,
@@ -522,8 +522,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
isDowngrade: !!params.isDowngrade,
upgradeTypeDisplayName: upgradeTypeDisplayName,
failuresTolerance: Em.Object.create({
- skipComponentFailures: params.skipComponentFailures,
- skipSCFailures: params.skipSCFailures
+ skipComponentFailures: params.skipComponentFailures == 'true',
+ skipSCFailures: params.skipSCFailures == 'true'
})
});
App.set('upgradeState', 'PENDING');
@@ -541,8 +541,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
*/
updateOptionsSuccessCallback: function (data, opt, params) {
this.set('failuresTolerance', Em.Object.create({
- skipComponentFailures: params.skipComponentFailures,
- skipSCFailures: params.skipSCFailures
+ skipComponentFailures: params.skipComponentFailures == 'true',
+ skipSCFailures: params.skipSCFailures == 'true'
}));
},
@@ -596,7 +596,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
});
} else {
var ruMethod = self.get('upgradeMethods').findProperty('type', 'ROLLING');
- var ssuMethod = self.get('upgradeMethods').findProperty('type', 'NON-ROLLING');
+ var ssuMethod = self.get('upgradeMethods').findProperty('type', 'NON_ROLLING');
ruMethod.set('selected', ruMethod.get('allowed'));
ssuMethod.set('selected', !ruMethod.get('allowed') && ssuMethod.get('allowed'));
}
@@ -665,8 +665,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
sender: self,
data: {
upgradeId: self.get('upgradeId'),
- skipComponentFailures: this.get('skipComponentFailures') || false,
- skipSCFailures: this.get('skipSCFailures') || false
+ skipComponentFailures: this.get('skipComponentFailures')? 'true': 'false',
+ skipSCFailures: this.get('skipSCFailures')? 'true': 'false'
},
success: 'updateOptionsSuccessCallback'
});
@@ -762,8 +762,8 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
value: version.get('repositoryVersion'),
label: version.get('displayName'),
type: version.get('upgradeType'),
- skipComponentFailures: version.get('skipComponentFailures'),
- skipSCFailures: version.get('skipSCFailures')
+ skipComponentFailures: version.get('skipComponentFailures') ? 'true' : 'false',
+ skipSCFailures: version.get('skipSCFailures') ? 'true' : 'false'
};
if (App.get('supports.preUpgradeCheck')) {
this.set('requestInProgress', true);
http://git-wip-us.apache.org/repos/asf/ambari/blob/716e2580/ambari-web/app/styles/stack_versions.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/stack_versions.less b/ambari-web/app/styles/stack_versions.less
index 299a912..97e1c64 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -323,20 +323,20 @@
.ROLLING:hover {
background-color: #c4dfb9;
}
- .NON-ROLLING {
+ .NON_ROLLING {
background-color: #d8e7fb;
.method-icon {
margin-left: 94px;
}
}
- .selected.NON-ROLLING {
+ .selected.NON_ROLLING {
border: solid 2px #7fb2f4;
box-shadow: 0 8px 6px -6px #72a0db;
}
- .NON-ROLLING:hover {
+ .NON_ROLLING:hover {
background-color: #c9defa;
}
- .ROLLING.not-allowed:hover, .NON-ROLLING.not-allowed:hover {
+ .ROLLING.not-allowed:hover, .NON_ROLLING.not-allowed:hover {
background-color: #f3f3f3;
}
.thumbnail.not-allowed {
@@ -355,12 +355,12 @@
color: #a9a9a9;
}
}
- .ROLLING,.NON-ROLLING,
- .ROLLING:hover,.NON-ROLLING:hover {
+ .ROLLING,.NON_ROLLING,
+ .ROLLING:hover,.NON_ROLLING:hover {
background-color: #f3f3f3;
}
- .selected.ROLLING,.selected.NON-ROLLING,
- .selected.ROLLING:hover,.selected.NON-ROLLING:hover {
+ .selected.ROLLING,.selected.NON_ROLLING,
+ .selected.ROLLING:hover,.selected.NON_ROLLING:hover {
border: solid 2px #a9a9a9;
box-shadow: 0 8px 6px -6px #a9a9a9;
}