Просмотр исходного кода

AMBARI-3539. NameNode HA wizard: Refreshing on review page navigates to select host page (alexantonenko)

Alex Antonenko 11 лет назад
Родитель
Сommit
94fd897f67

+ 10 - 0
ambari-web/app/controllers/main/admin/highAvailability/wizard_controller.js

@@ -43,6 +43,16 @@ App.HighAvailabilityWizardController = App.WizardController.extend({
     failedTask : null
     failedTask : null
   }),
   }),
 
 
+  setCurrentStep: function (currentStep, completed) {
+    this._super(currentStep, completed);
+    App.clusterStatus.setClusterStatus({
+      clusterName: this.get('content.cluster.name'),
+      clusterState: 'HIGH_AVAILABILITY_DEPLOY',
+      wizardControllerName: 'highAvailabilityWizardController',
+      localdb: App.db.data
+    });
+  },
+
   /**
   /**
    * return new object extended from clusterStatusTemplate
    * return new object extended from clusterStatusTemplate
    * @return Object
    * @return Object

+ 0 - 12
ambari-web/app/routes/high_availability_routes.js

@@ -227,12 +227,6 @@ module.exports = Em.Route.extend({
       var controller = router.get('highAvailabilityWizardController');
       var controller = router.get('highAvailabilityWizardController');
       controller.setCurrentStep('6');
       controller.setCurrentStep('6');
       controller.setLowerStepsDisable(6);
       controller.setLowerStepsDisable(6);
-      App.clusterStatus.setClusterStatus({
-        clusterName: this.get('content.cluster.name'),
-        clusterState: 'HIGH_AVAILABILITY_DEPLOY',
-        wizardControllerName: this.get('content.controllerName'),
-        localdb: App.db.data
-      });
       controller.dataLoading().done(function () {
       controller.dataLoading().done(function () {
         controller.loadAllPriorSteps();
         controller.loadAllPriorSteps();
         controller.connectOutlet('highAvailabilityWizardStep6',  controller.get('content'));
         controller.connectOutlet('highAvailabilityWizardStep6',  controller.get('content'));
@@ -273,12 +267,6 @@ module.exports = Em.Route.extend({
       var controller = router.get('highAvailabilityWizardController');
       var controller = router.get('highAvailabilityWizardController');
       controller.setCurrentStep('8');
       controller.setCurrentStep('8');
       controller.setLowerStepsDisable(8);
       controller.setLowerStepsDisable(8);
-      App.clusterStatus.setClusterStatus({
-        clusterName: this.get('content.cluster.name'),
-        clusterState: 'HIGH_AVAILABILITY_DEPLOY',
-        wizardControllerName: this.get('content.controllerName'),
-        localdb: App.db.data
-      });
       controller.dataLoading().done(function () {
       controller.dataLoading().done(function () {
         controller.loadAllPriorSteps();
         controller.loadAllPriorSteps();
         controller.connectOutlet('highAvailabilityWizardStep8',  controller.get('content'));
         controller.connectOutlet('highAvailabilityWizardStep8',  controller.get('content'));

+ 0 - 1
ambari-web/app/routes/rollbackHA_routes.js

@@ -89,7 +89,6 @@ module.exports = Em.Route.extend({
     route: '/step2',
     route: '/step2',
     connectOutlets: function (router) {
     connectOutlets: function (router) {
       var controller = router.get('rollbackHighAvailabilityWizardController');
       var controller = router.get('rollbackHighAvailabilityWizardController');
-      controller.setCurrentStep('2');
       App.clusterStatus.setClusterStatus({
       App.clusterStatus.setClusterStatus({
         clusterName: router.get('content.cluster.name'),
         clusterName: router.get('content.cluster.name'),
         clusterState: 'ROLLBACK_HIGH_AVAILABILITY',
         clusterState: 'ROLLBACK_HIGH_AVAILABILITY',