소스 검색

AMBARI-11981. Install Wizard: step9 opens every time after page refresh after install failed (akovalenko)

Aleksandr Kovalenko 10 년 전
부모
커밋
d7df0c3930
3개의 변경된 파일3개의 추가작업 그리고 11개의 파일을 삭제
  1. 1 1
      ambari-web/app/controllers/wizard.js
  2. 1 9
      ambari-web/app/mixins/routers/redirections.js
  3. 1 1
      ambari-web/app/models/cluster_states.js

+ 1 - 1
ambari-web/app/controllers/wizard.js

@@ -209,7 +209,7 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
         clusterName: this.get('clusterName'),
         clusterState: 'CLUSTER_NOT_CREATED_1',
         wizardControllerName: 'installerController',
-        localdb: App.db.data
+        localdb: {}
       });
     }
     if ((this.get('currentStep') - step) > 1 && !disableNaviWarning) {

+ 1 - 9
ambari-web/app/mixins/routers/redirections.js

@@ -49,15 +49,7 @@ App.RouterRedirections = Em.Mixin.create({
     var path = isOnInstaller ? '' : 'installer.';
     switch (currentClusterStatus.clusterState) {
       case 'CLUSTER_NOT_CREATED_1' :
-        var localDb = currentClusterStatus.localdb;
-        if (localDb && localDb.Installer && localDb.Installer.currentStep) {
-          App.db.data = currentClusterStatus.localdb;
-          App.get('router').setAuthenticated(true);
-          var controllerName = installerController.get('name');
-          var suffixLength = 10;
-          var currentStep = App.get('router').getWizardCurrentStep(controllerName.substr(0, controllerName.length - suffixLength));
-          installerController.setCurrentStep(currentStep);
-        }
+        App.get('router').setAuthenticated(true);
         router.transitionTo(path + 'step' + installerController.get('currentStep'));
         break;
       case 'CLUSTER_DEPLOY_PREP_2' :

+ 1 - 1
ambari-web/app/models/cluster_states.js

@@ -134,7 +134,7 @@ App.clusterStatus = Em.Object.create(App.UserPref, {
       if (response.wizardControllerName) {
         this.set('wizardControllerName', response.wizardControllerName);
       }
-      if (response.localdb) {
+      if (response.localdb && !$.isEmptyObject(response.localdb)) {
         this.set('localdb', response.localdb);
         // restore HAWizard data if process was started
         var isHAWizardStarted = App.isAccessible('ADMIN') && !App.isEmptyObject(response.localdb.HighAvailabilityWizard);