Przeglądaj źródła

AMBARI-2967. NameNode HA Wizard: Manual step Create Checkpoint should show the actual HDFS username. (Antonenko Alexander via yusaku)

Yusaku Sako 11 lat temu
rodzic
commit
6d37377ccc

+ 5 - 1
ambari-web/app/controllers/main/admin/highAvailability/step1_controller.js

@@ -18,5 +18,9 @@
 
 
 var App = require('app');
 var App = require('app');
 
 
-App.HighAvailabilityWizardStep1Controller = Em.Controller.extend();
+require('controllers/main/admin/misc_controller');
+
+App.HighAvailabilityWizardStep1Controller = App.MainAdminMiscController.extend({
+  name:"highAvailabilityWizardStep1Controller"
+});
 
 

+ 1 - 1
ambari-web/app/controllers/main/admin/highAvailability/step4_controller.js

@@ -20,7 +20,7 @@ var App = require('app');
 
 
 require('controllers/main/admin/misc_controller');
 require('controllers/main/admin/misc_controller');
 
 
-App.HighAvailabilityWizardStep4Controller = App.MainAdminMiscController.extend({
+App.HighAvailabilityWizardStep4Controller = Em.Controller.extend({
 
 
   name:"highAvailabilityWizardStep4Controller"
   name:"highAvailabilityWizardStep4Controller"
 
 

+ 1 - 1
ambari-web/app/routes/high_availability_routes.js

@@ -69,7 +69,7 @@ module.exports = Em.Route.extend({
       controller.setCurrentStep('1');
       controller.setCurrentStep('1');
       controller.dataLoading().done(function () {
       controller.dataLoading().done(function () {
         controller.loadAllPriorSteps();
         controller.loadAllPriorSteps();
-        controller.connectOutlet('highAvailabilityWizardStep1');
+        controller.connectOutlet('highAvailabilityWizardStep1', controller.get('content'));
       })
       })
     },
     },
     next: function (router) {
     next: function (router) {

+ 5 - 1
ambari-web/app/views/main/admin/highAvailability/step1_view.js

@@ -21,6 +21,10 @@ var App = require('app');
 
 
 App.HighAvailabilityWizardStep1View = Em.View.extend({
 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();
+  }
 
 
 });
 });

+ 0 - 4
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'),
   templateName: require('templates/main/admin/highAvailability/step4'),
 
 
-  didInsertElement: function() {
-    this.get('controller').loadUsers();
-  },
-
   step4BodyText: function () {
   step4BodyText: function () {
     var nN = this.get('controller.content.masterComponentHosts').findProperty('isCurNameNode', true);
     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);
     return Em.I18n.t('admin.highAvailability.wizard.step4.body').format(this.get('controller.content.hdfsUser'), nN.hostName);