Browse Source

AMBARI-2806. Typing /#/installer/stepX in the UI takes the user to the Install Wizard even if the cluster already exists. (atkach via yusaku)

Yusaku Sako 11 years ago
parent
commit
651d870c93
1 changed files with 33 additions and 29 deletions
  1. 33 29
      ambari-web/app/routes/installer.js

+ 33 - 29
ambari-web/app/routes/installer.js

@@ -38,36 +38,40 @@ module.exports = Em.Route.extend({
         Ember.run.next(function () {
           var installerController = router.get('installerController');
 
-            App.clusterStatus.updateFromServer();
-            var currentClusterStatus = App.clusterStatus.get('value');
-
-            if (currentClusterStatus) {
-              switch (currentClusterStatus.clusterState) {
-                case 'CLUSTER_DEPLOY_PREP_2' :
-                  installerController.setCurrentStep('8');
-                  App.db.data = currentClusterStatus.localdb;
-                  break;
-                case 'CLUSTER_INSTALLING_3' :
-                case 'SERVICE_STARTING_3' :
-                  if(!installerController.get('isStep9')){
-                    installerController.setCurrentStep('9');
-                  }
-                  App.db.data = currentClusterStatus.localdb;
-                  break;
-                case 'CLUSTER_INSTALLED_4' :
-                  if(!installerController.get('isStep10')){
-                    installerController.setCurrentStep('10');
-                  }
-                  App.db.data = currentClusterStatus.localdb;
-                  break;
-                case 'CLUSTER_STARTED_5' :
-                  router.transitionTo('main.index');
-                  break;
-                default:
-                  break;
-              }
+          App.clusterStatus.updateFromServer();
+          var currentClusterStatus = App.clusterStatus.get('value');
+
+          if (currentClusterStatus) {
+            switch (currentClusterStatus.clusterState) {
+              case 'CLUSTER_NOT_CREATED_1' :
+                router.transitionTo('step' + installerController.get('currentStep'));
+                break;
+              case 'CLUSTER_DEPLOY_PREP_2' :
+                installerController.setCurrentStep('8');
+                App.db.data = currentClusterStatus.localdb;
+                router.transitionTo('step' + installerController.get('currentStep'));
+                break;
+              case 'CLUSTER_INSTALLING_3' :
+              case 'SERVICE_STARTING_3' :
+                if (!installerController.get('isStep9')) {
+                  installerController.setCurrentStep('9');
+                }
+                App.db.data = currentClusterStatus.localdb;
+                router.transitionTo('step' + installerController.get('currentStep'));
+                break;
+              case 'CLUSTER_INSTALLED_4' :
+                if (!installerController.get('isStep10')) {
+                  installerController.setCurrentStep('10');
+                }
+                App.db.data = currentClusterStatus.localdb;
+                router.transitionTo('step' + installerController.get('currentStep'));
+                break;
+              case 'CLUSTER_STARTED_5' :
+              default:
+                router.transitionTo('main.index');
+                break;
             }
-          router.transitionTo('step' + installerController.get('currentStep'));
+          }
         });
       } else {
         Em.run.next(function () {