Updated Branches: refs/heads/trunk 211ad2017 -> 6d37377cc
AMBARI-2967. NameNode HA Wizard: Manual step Create Checkpoint should show the actual HDFS username. (Antonenko Alexander via yusaku) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/6d37377c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/6d37377c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/6d37377c Branch: refs/heads/trunk Commit: 6d37377ccc65a3efd2f8de0022bf56db5e853920 Parents: 211ad20 Author: Yusaku Sako <[email protected]> Authored: Tue Aug 20 13:17:22 2013 -0700 Committer: Yusaku Sako <[email protected]> Committed: Tue Aug 20 13:17:22 2013 -0700 ---------------------------------------------------------------------- .../main/admin/highAvailability/step1_controller.js | 6 +++++- .../main/admin/highAvailability/step4_controller.js | 2 +- ambari-web/app/routes/high_availability_routes.js | 2 +- ambari-web/app/views/main/admin/highAvailability/step1_view.js | 6 +++++- ambari-web/app/views/main/admin/highAvailability/step4_view.js | 4 ---- 5 files changed, 12 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6d37377c/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 72697e5..5e22cb5 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/step1_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/step1_controller.js @@ -18,5 +18,9 @@ var App = require('app'); -App.HighAvailabilityWizardStep1Controller = Em.Controller.extend(); +require('controllers/main/admin/misc_controller'); + +App.HighAvailabilityWizardStep1Controller = App.MainAdminMiscController.extend({ + name:"highAvailabilityWizardStep1Controller" +}); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6d37377c/ambari-web/app/controllers/main/admin/highAvailability/step4_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/highAvailability/step4_controller.js b/ambari-web/app/controllers/main/admin/highAvailability/step4_controller.js index 6455ef8..1985aed 100644 --- a/ambari-web/app/controllers/main/admin/highAvailability/step4_controller.js +++ b/ambari-web/app/controllers/main/admin/highAvailability/step4_controller.js @@ -20,7 +20,7 @@ var App = require('app'); require('controllers/main/admin/misc_controller'); -App.HighAvailabilityWizardStep4Controller = App.MainAdminMiscController.extend({ +App.HighAvailabilityWizardStep4Controller = Em.Controller.extend({ name:"highAvailabilityWizardStep4Controller" http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6d37377c/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 ad6171c..0becf5e 100644 --- a/ambari-web/app/routes/high_availability_routes.js +++ b/ambari-web/app/routes/high_availability_routes.js @@ -69,7 +69,7 @@ module.exports = Em.Route.extend({ controller.setCurrentStep('1'); controller.dataLoading().done(function () { controller.loadAllPriorSteps(); - controller.connectOutlet('highAvailabilityWizardStep1'); + controller.connectOutlet('highAvailabilityWizardStep1', controller.get('content')); }) }, next: function (router) { http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6d37377c/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 e0a30d8..31b8ee6 100644 --- a/ambari-web/app/views/main/admin/highAvailability/step1_view.js +++ b/ambari-web/app/views/main/admin/highAvailability/step1_view.js @@ -21,6 +21,10 @@ var App = require('app'); App.HighAvailabilityWizardStep1View = Em.View.extend({ - templateName: require('templates/main/admin/highAvailability/step1') + templateName: require('templates/main/admin/highAvailability/step1'), + + didInsertElement: function() { + this.get('controller').loadUsers(); + } }); http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/6d37377c/ambari-web/app/views/main/admin/highAvailability/step4_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/highAvailability/step4_view.js b/ambari-web/app/views/main/admin/highAvailability/step4_view.js index 6920241..2e15a72 100644 --- a/ambari-web/app/views/main/admin/highAvailability/step4_view.js +++ b/ambari-web/app/views/main/admin/highAvailability/step4_view.js @@ -23,10 +23,6 @@ App.HighAvailabilityWizardStep4View = Em.View.extend({ templateName: require('templates/main/admin/highAvailability/step4'), - didInsertElement: function() { - this.get('controller').loadUsers(); - }, - step4BodyText: function () { var nN = this.get('controller.content.masterComponentHosts').findProperty('isCurNameNode', true); return Em.I18n.t('admin.highAvailability.wizard.step4.body').format(this.get('controller.content.hdfsUser'), nN.hostName);
