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 2016/02/01 16:41:54 UTC
[17/39] ambari git commit: Revert "AMBARI-14822 Combo Search: Create
auto suggest for Host attribute filters (Joe Wang via rzang)"
Revert "AMBARI-14822 Combo Search: Create auto suggest for Host attribute filters (Joe Wang via rzang)"
This reverts commit 5e09053deb0700b09ced4f8f12902ff2ea60154a.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cad69e61
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cad69e61
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cad69e61
Branch: refs/heads/branch-dev-patch-upgrade
Commit: cad69e6132b554386e82d45950fc1b302f689af7
Parents: 5e09053
Author: Richard Zang <rz...@apache.org>
Authored: Fri Jan 29 08:51:50 2016 +0800
Committer: Richard Zang <rz...@apache.org>
Committed: Fri Jan 29 08:51:50 2016 +0800
----------------------------------------------------------------------
.../main/admin/stack_and_upgrade_controller.js | 22 ++------------------
ambari-web/app/messages.js | 2 --
.../stack_upgrade/stack_upgrade_wizard.hbs | 8 +++----
ambari-web/app/utils/ajax/ajax.js | 3 ---
4 files changed, 6 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/cad69e61/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 16a58d6..f80c5ea 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
@@ -553,15 +553,13 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
* abort upgrade (in order to start Downgrade)
*/
abortUpgrade: function () {
- var errorCallback = this.get('isDowngrade') ? 'abortDowngradeErrorCallback' : 'abortUpgradeErrorCallback';
return App.ajax.send({
name: 'admin.upgrade.abort',
sender: this,
data: {
- upgradeId: this.get('upgradeId'),
- isDowngrade: this.get('isDowngrade')
+ upgradeId: this.get('upgradeId')
},
- error: errorCallback
+ error: 'abortUpgradeErrorCallback'
});
},
@@ -581,22 +579,6 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
App.showAlertPopup(header, body);
},
- /**
- * error callback of <code>abortDowngrade()</code>
- * @param {object} data
- */
- abortDowngradeErrorCallback: function (data) {
- var header = Em.I18n.t('admin.stackDowngrade.state.paused.fail.header');
- var body = Em.I18n.t('admin.stackDowngrade.state.paused.fail.body');
- if(data && data.responseText){
- try {
- var json = $.parseJSON(data.responseText);
- body = body + ' ' + json.message;
- } catch (err) {}
- }
- App.showAlertPopup(header, body);
- },
-
retryUpgrade: function () {
this.setProperties({
requestInProgress: true,
http://git-wip-us.apache.org/repos/asf/ambari/blob/cad69e61/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 916ca2a..d6ecbf3 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1497,8 +1497,6 @@ Em.I18n.translations = {
'admin.stackVersions.version.downgrade.suspended': "Downgrade: Paused",
'admin.stackUpgrade.state.paused.fail.header': "Pause Upgrade failed",
'admin.stackUpgrade.state.paused.fail.body': "Upgrade could not be paused. Try again later.",
- 'admin.stackDowngrade.state.paused.fail.header': "Pause Downgrade failed",
- 'admin.stackDowngrade.state.paused.fail.body': "Downgrade could not be paused. Try again later.",
'admin.stackVersions.version.upgrade.upgradeOptions.header': "Upgrade Options",
'admin.stackVersions.version.upgrade.upgradeOptions.bodyMsg.version': "You are about to perform an upgrade to <b>{0}</b>.",
http://git-wip-us.apache.org/repos/asf/ambari/blob/cad69e61/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
index 02022cf..a13e2c2 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs
@@ -81,7 +81,7 @@
<button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.failedItem target="controller"}}>{{t common.downgrade}}</button>
{{/if}}
{{#if isDowngrade}}
- <button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button>
+ <button class="btn" {{action closeWizard target="view.parentView"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button>
{{else}}
<button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button>
{{/if}}
@@ -108,7 +108,7 @@
<button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button>
{{/if}}
{{#if isDowngrade}}
- <button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button>
+ <button class="btn" {{action closeWizard target="view.parentView"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button>
{{else}}
<button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button>
{{/if}}
@@ -189,7 +189,7 @@
<button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button>
{{/if}}
{{#if isDowngrade}}
- <button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button>
+ <button class="btn" {{action closeWizard target="view.parentView"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button>
{{else}}
<button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button>
{{/if}}
@@ -252,7 +252,7 @@
<button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button>
{{/if}}
{{#if isDowngrade}}
- <button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button>
+ <button class="btn" {{action closeWizard target="view.parentView"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button>
{{else}}
<button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button>
{{/if}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/cad69e61/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 a301148..df3782f 100644
--- a/ambari-web/app/utils/ajax/ajax.js
+++ b/ambari-web/app/utils/ajax/ajax.js
@@ -1666,9 +1666,6 @@ var urls = {
'format': function (data) {
return {
data: JSON.stringify({
- "RequestInfo": {
- "downgrade": data.isDowngrade
- },
"Upgrade": {
"request_status": "ABORTED"
}