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 2013/10/21 19:52:46 UTC
git commit: AMBARI-3553. NameNode HA wizard: Refreshing the wizard
displays incorrect manual commands. (alexantonenko)
Updated Branches:
refs/heads/trunk a86099d33 -> c0b68039c
AMBARI-3553. NameNode HA wizard: Refreshing the wizard displays incorrect manual commands. (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/c0b68039
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/c0b68039
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/c0b68039
Branch: refs/heads/trunk
Commit: c0b68039c3eed70d46f1ea0be72d4502b512dd2f
Parents: a86099d
Author: Alex Antonenko <hi...@gmail.com>
Authored: Mon Oct 21 20:47:29 2013 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Mon Oct 21 20:47:29 2013 +0300
----------------------------------------------------------------------
.../main/admin/highAvailability/step1_controller.js | 2 +-
.../main/admin/highAvailability/wizard_controller.js | 11 +++++++++++
ambari-web/app/routes/high_availability_routes.js | 11 +++++++----
ambari-web/app/utils/db.js | 11 +++++++++++
.../app/views/main/admin/highAvailability/step1_view.js | 1 -
5 files changed, 30 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c0b68039/ambari-web/app/controllers/main/admin/highAvailability/step1_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step1_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step1_controller.js
index bb875c5..d3c1da4 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/step1_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/step1_controller.js
@@ -20,7 +20,7 @@ var App = require('app');
require('controllers/main/admin/misc_controller');
-App.HighAvailabilityWizardStep1Controller = App.MainAdminMiscController.extend({
+App.HighAvailabilityWizardStep1Controller = Em.Controller.extend({
name: "highAvailabilityWizardStep1Controller",
isNameServiceIdValid: function () {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c0b68039/ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js
index 226ff93..e120235 100644
--- a/ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js
+++ b/ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js
@@ -164,6 +164,10 @@ App.HighAvailabilityWizardController = App.WizardController.extend({
this.set('content.masterComponentHosts', masterComponentHosts);
},
+ saveHdfsUser: function () {
+ App.db.setHighAvailabilityWizardHdfsUser(this.get('content.hdfsUser'));
+ },
+
saveTasksStatuses: function(statuses){
App.db.setHighAvailabilityWizardTasksStatuses(statuses);
this.set('content.tasksStatuses', statuses);
@@ -192,6 +196,12 @@ App.HighAvailabilityWizardController = App.WizardController.extend({
this.set('content.'+tag, tagVal);
},
+
+ loadHdfsUser: function(){
+ var hdfsUser = App.db.getHighAvailabilityWizardHdfsUser();
+ this.set('content.hdfsUser', hdfsUser);
+ },
+
loadTasksStatuses: function(){
var statuses = App.db.getHighAvailabilityWizardTasksStatuses();
this.set('content.tasksStatuses', statuses);
@@ -248,6 +258,7 @@ App.HighAvailabilityWizardController = App.WizardController.extend({
this.loadServicesFromServer();
this.loadMasterComponentHosts();
this.loadConfirmedHosts();
+ this.loadHdfsUser();
case '1':
this.load('cluster');
}
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c0b68039/ambari-web/app/routes/high_availability_routes.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/routes/high_availability_routes.js b/ambari-web/app/routes/high_availability_routes.js
index a47d9df..bae310f 100644
--- a/ambari-web/app/routes/high_availability_routes.js
+++ b/ambari-web/app/routes/high_availability_routes.js
@@ -98,10 +98,13 @@ module.exports = Em.Route.extend({
route: '/step1',
connectOutlets: function (router) {
var controller = router.get('highAvailabilityWizardController');
- controller.setCurrentStep('1');
- controller.dataLoading().done(function () {
- controller.loadAllPriorSteps();
- controller.connectOutlet('highAvailabilityWizardStep1', controller.get('content'));
+ controller.usersLoading().done(function () {
+ controller.saveHdfsUser();
+ controller.setCurrentStep('1');
+ controller.dataLoading().done(function () {
+ controller.loadAllPriorSteps();
+ controller.connectOutlet('highAvailabilityWizardStep1', controller.get('content'));
+ })
})
},
unroutePath: function () {
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c0b68039/ambari-web/app/utils/db.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/db.js b/ambari-web/app/utils/db.js
index 471d6a3..ddec85a 100644
--- a/ambari-web/app/utils/db.js
+++ b/ambari-web/app/utils/db.js
@@ -385,6 +385,12 @@ App.db.setHighAvailabilityWizardTasksStatuses = function (tasksStatuses) {
localStorage.setObject('ambari', App.db.data);
};
+App.db.setHighAvailabilityWizardHdfsUser = function (hdfsUser) {
+ App.db.data = localStorage.getObject('ambari');
+ App.db.data.HighAvailabilityWizard.hdfsUser = hdfsUser;
+ localStorage.setObject('ambari', App.db.data);
+};
+
App.db.setHighAvailabilityWizardRequestIds = function (requestIds) {
App.db.data = localStorage.getObject('ambari');
App.db.data.HighAvailabilityWizard.requestIds = requestIds;
@@ -688,6 +694,11 @@ App.db.getStacks = function () {
return App.db.data.app.stacksVersions;
};
+App.db.getHighAvailabilityWizardHdfsUser = function () {
+ App.db.data = localStorage.getObject('ambari');
+ return App.db.data.HighAvailabilityWizard.hdfsUser;
+};
+
App.db.getHighAvailabilityWizardTasksStatuses = function () {
App.db.data = localStorage.getObject('ambari');
return App.db.data.HighAvailabilityWizard.tasksStatuses;
http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/c0b68039/ambari-web/app/views/main/admin/highAvailability/step1_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/highAvailability/step1_view.js b/ambari-web/app/views/main/admin/highAvailability/step1_view.js
index 4a6f3f6..93a38f3 100644
--- a/ambari-web/app/views/main/admin/highAvailability/step1_view.js
+++ b/ambari-web/app/views/main/admin/highAvailability/step1_view.js
@@ -25,7 +25,6 @@ App.HighAvailabilityWizardStep1View = Em.View.extend({
didInsertElement: function() {
App.popover($("div.controls input[type=text]"), {'placement': 'right', 'trigger': 'hover', 'title': this.t('admin.highAvailability.wizard.step1.nameserviceid.tooltip.title'), 'content': this.t('admin.highAvailability.wizard.step1.nameserviceid.tooltip.content')});
- this.get('controller').loadUsers();
},
showInputError: function () {