You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sr...@apache.org on 2013/10/31 02:13:20 UTC
git commit: Revert "AMBARI-3054. User Preference to show 'Background
Operations'. (xiwang)"
Updated Branches:
refs/heads/trunk 68f77e653 -> 70aa9b085
Revert "AMBARI-3054. User Preference to show 'Background Operations'. (xiwang)"
This reverts commit 68f77e6536cb1293b58aefc32300395305795792.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/70aa9b08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/70aa9b08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/70aa9b08
Branch: refs/heads/trunk
Commit: 70aa9b085912c30ab59550e3101745038ef075b4
Parents: 68f77e6
Author: Srimanth Gunturi <sg...@hortonworks.com>
Authored: Wed Oct 30 18:13:02 2013 -0700
Committer: Srimanth Gunturi <sg...@hortonworks.com>
Committed: Wed Oct 30 18:13:02 2013 -0700
----------------------------------------------------------------------
ambari-web/app/controllers.js | 1 -
.../global/background_operations_controller.js | 4 +--
ambari-web/app/controllers/main/host/details.js | 32 ++++++--------------
ambari-web/app/controllers/main/service.js | 4 +--
ambari-web/app/controllers/main/service/item.js | 16 +++-------
ambari-web/app/messages.js | 4 ---
ambari-web/app/routes/main.js | 8 +----
ambari-web/app/styles/application.less | 15 ---------
ambari-web/app/utils/host_progress_popup.js | 11 -------
ambari-web/app/views.js | 1 -
ambari-web/app/views/common/modal_popup.js | 2 --
ambari-web/app/views/main/admin.js | 5 ---
12 files changed, 16 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/controllers.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers.js b/ambari-web/app/controllers.js
index 78a5f45..80bfac9 100644
--- a/ambari-web/app/controllers.js
+++ b/ambari-web/app/controllers.js
@@ -44,7 +44,6 @@ require('controllers/main/admin/rollbackHA/step2_controller');
require('controllers/main/admin/rollbackHA/step3_controller');
require('controllers/main/admin/rollbackHA/rollback_wizard_controller');
require('controllers/main/admin/cluster');
-require('controllers/main/admin/user_settings');
require('controllers/main/admin/stack_upgrade_controller');
require('controllers/main/admin/user');
require('controllers/main/admin/misc_controller');
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/controllers/global/background_operations_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/global/background_operations_controller.js b/ambari-web/app/controllers/global/background_operations_controller.js
index f5d6623..dc54cd1 100644
--- a/ambari-web/app/controllers/global/background_operations_controller.js
+++ b/ambari-web/app/controllers/global/background_operations_controller.js
@@ -192,9 +192,7 @@ App.BackgroundOperationsController = Em.Controller.extend({
*/
showPopup: function(){
App.updater.immediateRun('requestMostRecent');
-
- if(this.get('popupView') && App.HostPopup.get('isBackgroundOperations') && App.HostPopup.get('showServices')){
- this.set ('popupView.isNotShowBgChecked', !App.router.get('mainAdminUserSettingsController').loadShowBgChecked());
+ if(this.get('popupView') && App.HostPopup.get('isBackgroundOperations')){
this.set('popupView.isOpen', true);
$(this.get('popupView.element')).appendTo('#wrapper');
} else {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/controllers/main/host/details.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js
index 81b95fa..d5bbfa5 100644
--- a/ambari-web/app/controllers/main/host/details.js
+++ b/ambari-web/app/controllers/main/host/details.js
@@ -239,7 +239,7 @@ App.MainHostDetailsController = Em.Controller.extend({
deleted = {xhr: xhr, url: url, method: 'DELETE'};
},
statusCode: require('data/statusCodes')
- });
+ });
return deleted;
},
@@ -278,9 +278,7 @@ App.MainHostDetailsController = Em.Controller.extend({
App.router.get('clusterController').loadUpdatedStatusDelayed(500);
}
- if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
- App.router.get('backgroundOperationsController').showPopup();
- }
+ App.router.get('backgroundOperationsController').showPopup();
});
});
@@ -351,14 +349,10 @@ App.MainHostDetailsController = Em.Controller.extend({
component.set('workStatus', App.HostComponentStatus.stopped);
},App.testModeDelayForActions);
}
-
} else {
App.router.get('clusterController').loadUpdatedStatusDelayed(500);
}
-
- if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
- App.router.get('backgroundOperationsController').showPopup();
- }
+ App.router.get('backgroundOperationsController').showPopup();
});
},
@@ -471,9 +465,8 @@ App.MainHostDetailsController = Em.Controller.extend({
App.router.get('clusterController').loadUpdatedStatusDelayed(500);
}
- if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
- App.router.get('backgroundOperationsController').showPopup();
- }
+ App.router.get('backgroundOperationsController').showPopup();
+
});
});
},
@@ -527,9 +520,7 @@ App.MainHostDetailsController = Em.Controller.extend({
App.router.get('clusterController').loadUpdatedStatusDelayed(500);
}
- if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
- App.router.get('backgroundOperationsController').showPopup();
- }
+ App.router.get('backgroundOperationsController').showPopup();
});
}
@@ -557,9 +548,7 @@ App.MainHostDetailsController = Em.Controller.extend({
}
self.doDatanodeDecommission(decommissionHostNames, true);
}
- if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
- App.router.get('backgroundOperationsController').showPopup();
- }
+ App.router.get('backgroundOperationsController').showPopup();
});
},
@@ -661,9 +650,7 @@ App.MainHostDetailsController = Em.Controller.extend({
decommissionHostNames.splice(index, 1);
self.doDatanodeDecommission(decommissionHostNames, false);
}
- if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
- App.router.get('backgroundOperationsController').showPopup();
- }
+ App.router.get('backgroundOperationsController').showPopup();
});
},
@@ -872,5 +859,4 @@ App.MainHostDetailsController = Em.Controller.extend({
});
}
-});
-
+});
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/controllers/main/service.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service.js b/ambari-web/app/controllers/main/service.js
index 4bc3601..570409f 100644
--- a/ambari-web/app/controllers/main/service.js
+++ b/ambari-web/app/controllers/main/service.js
@@ -110,9 +110,7 @@ App.MainServiceController = Em.ArrayController.extend({
var requestId = data.Requests.id;
console.log('requestId is: ' + requestId);
- if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
- App.router.get('backgroundOperationsController').showPopup();
- }
+ App.router.get('backgroundOperationsController').showPopup();
},
allServicesCallErrorCallback: function() {
console.log("ERROR");
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/controllers/main/service/item.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js
index 5c9b7dd..64fb843 100644
--- a/ambari-web/app/controllers/main/service/item.js
+++ b/ambari-web/app/controllers/main/service/item.js
@@ -76,9 +76,7 @@ App.MainServiceItemController = Em.Controller.extend({
else {
App.router.get('clusterController').loadUpdatedStatusDelayed(500);// @todo check working without param 500
}
- if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
- App.router.get('backgroundOperationsController').showPopup();
- }
+ App.router.get('backgroundOperationsController').showPopup();
},
/**
* Confirmation popup for start/stop services
@@ -142,9 +140,7 @@ App.MainServiceItemController = Em.Controller.extend({
var self = this;
App.showConfirmationPopup(function() {
self.content.set('runRebalancer', true);
- if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
- App.router.get('backgroundOperationsController').showPopup();
- }
+ App.router.get('backgroundOperationsController').showPopup();
});
},
@@ -156,9 +152,7 @@ App.MainServiceItemController = Em.Controller.extend({
var self = this;
App.showConfirmationPopup(function() {
self.content.set('runCompaction', true);
- if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
- App.router.get('backgroundOperationsController').showPopup();
- }
+ App.router.get('backgroundOperationsController').showPopup();
});
},
@@ -192,9 +186,7 @@ App.MainServiceItemController = Em.Controller.extend({
runSmokeTestSuccessCallBack: function(data) {
if (data.Requests.id) {
- if (App.router.get('mainAdminUserSettingsController').loadShowBgChecked()) {
- App.router.get('backgroundOperationsController').showPopup();
- }
+ App.router.get('backgroundOperationsController').showPopup();
}
else {
console.warn('error during runSmokeTestSuccessCallBack');
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 2ae1691..8c9568e 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -133,7 +133,6 @@ Em.I18n.translations = {
'common.stats':'Stats',
'common.abort': 'Abort',
'common.misc': 'Misc',
- 'common.userSettings': 'User Settings',
'common.operations': 'Operations',
'common.reinstall': 'Re-Install',
'common.errorPopup.header': 'An error has been encountered',
@@ -870,9 +869,6 @@ Em.I18n.translations = {
'admin.cluster.upgradeAvailable':'Upgrade available',
'admin.cluster.upgradeUnavailable':'Upgrade unavailable',
- 'admin.userSettings.header': 'Customize User Settings',
- 'admin.userSettings.showBgOperations': 'Show background operations dialog when an operation is started',
- 'admin.userSettings.notShowBgOperations': 'Do not show this dialog again when starting a background operation',
'admin.misc.header': 'Service Users and Groups',
'admin.misc.nothingToShow': 'No user accounts to display',
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/routes/main.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js
index ec2dd9a..f0e1670 100644
--- a/ambari-web/app/routes/main.js
+++ b/ambari-web/app/routes/main.js
@@ -793,13 +793,7 @@ module.exports = Em.Route.extend({
router.get('mainAdminController').connectOutlet('mainAdminAdvanced');
}
}),
- adminUserSettings: Em.Route.extend({
- route: '/userSettings',
- connectOutlets: function (router) {
- router.set('mainAdminController.category', "userSettings");
- router.get('mainAdminController').connectOutlet('mainAdminUserSettings');
- }
- }),
+
adminMisc: Em.Route.extend({
route: '/misc',
connectOutlets: function (router) {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 49c985e..6568d9b 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1053,16 +1053,6 @@ a:focus {
overflow: auto;
width: 100%;
}
- .modal-footer {
- #footer-checkbox {
- text-align: left;
- padding-top: 3px;
- margin-left: 22px;
- .checkbox {
- margin: 0px;
- }
- }
- }
.modal-body {
@@ -3090,11 +3080,6 @@ table.graphs {
}
}
-.admin-user-settings {
- .checkbox {
- margin: 0px;
- }
-}
/*End Admin*/
/*assign masters*/
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/utils/host_progress_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js
index 5930ed3..9b3006f 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -479,17 +479,6 @@ App.HostPopup = Em.Object.create({
template: Ember.Handlebars.compile('{{popupHeaderName}}')
}),
classNames: ['sixty-percent-width-modal'],
- // for the checkbox: do not show this dialog again
- hasFooterCheckbox: true,
- isNotShowBgChecked : null,
- updateNotShowBgChecked: function () {
- var curVal = !this.get('isNotShowBgChecked');
- var key = App.router.get('mainAdminUserSettingsController').persistKey();
- if (!App.testMode) {
- App.router.get('mainAdminUserSettingsController').postUserPref(key, curVal);
- }
- }.observes('isNotShowBgChecked'),
-
autoHeight: false,
closeModelPopup: function () {
this.set('isOpen', false);
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/views.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views.js b/ambari-web/app/views.js
index 16be05b..c7980cb 100644
--- a/ambari-web/app/views.js
+++ b/ambari-web/app/views.js
@@ -72,7 +72,6 @@ require('views/main/admin/rollbackHA/step3_view');
require('views/main/admin/rollbackHA/rollback_wizard_view');
require('views/main/admin/cluster');
require('views/main/admin/misc_view');
-require('views/main/admin/user_settings');
require('views/main/admin/stack_upgrade');
require('views/main/admin/advanced');
require('views/main/admin/advanced/password');
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/views/common/modal_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/common/modal_popup.js b/ambari-web/app/views/common/modal_popup.js
index f231965..ecb8b5e 100644
--- a/ambari-web/app/views/common/modal_popup.js
+++ b/ambari-web/app/views/common/modal_popup.js
@@ -39,8 +39,6 @@ App.ModalPopup = Ember.View.extend({
'{{#if footerClass}}{{view footerClass}}',
'{{else}}',
'<div class="modal-footer">',
- '{{#if view.hasFooterCheckbox}} <label id="footer-checkbox" class="span8"> {{view Ember.Checkbox classNames="checkbox" checkedBinding="view.isNotShowBgChecked"}} ' +
- '{{t admin.userSettings.notShowBgOperations}}</label> {{/if}}',
'{{#if view.secondary}}<a class="btn" {{action onSecondary target="view"}}>{{view.secondary}}</a>{{/if}}',
'{{#if view.primary}}<a {{bindAttr class="view.enablePrimary::disabled :btn :btn-success"}} {{action onPrimary target="view"}}>{{view.primary}}</a>{{/if}}',
'</div>',
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/70aa9b08/ambari-web/app/views/main/admin.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin.js b/ambari-web/app/views/main/admin.js
index 33479a5..0d6ec6c 100644
--- a/ambari-web/app/views/main/admin.js
+++ b/ambari-web/app/views/main/admin.js
@@ -47,11 +47,6 @@ App.MainAdminView = Em.View.extend({
label: Em.I18n.t('common.cluster')
});
items.push({
- name: 'userSettings',
- url: 'adminUserSettings',
- label: Em.I18n.t('common.userSettings')
- });
- items.push({
name: 'misc',
url: 'adminMisc',
label: Em.I18n.t('common.misc')