Explorar o código

AMBARI-16902 Going back form review page to config page on Installer and ADW clears min/max recommendatoins. (ababiichuk)

ababiichuk %!s(int64=9) %!d(string=hai) anos
pai
achega
5ecd3244d4

+ 0 - 6
ambari-web/app/controllers/installer.js

@@ -238,12 +238,6 @@ App.InstallerController = App.WizardController.extend({
   loadStacks: function () {
     var stacks = this.get('content.stacks');
     var dfd = $.Deferred();
-    App.configsCollection.clearAll();
-    App.Section.find().clear();
-    App.SubSection.find().clear();
-    App.SubSectionTab.find().clear();
-    App.Tab.find().clear();
-    this.set('stackConfigsLoaded', false);
     if (stacks && stacks.get('length')) {
       App.set('currentStackVersion', App.Stack.find().findProperty('isSelected').get('stackNameVersion'));
       dfd.resolve(true);

+ 16 - 3
ambari-web/app/controllers/wizard.js

@@ -1325,14 +1325,27 @@ App.WizardController = Em.Controller.extend(App.LocalStorage, App.ThemesMappingM
           });
         });
       });
-    }
-    else {
+    } else {
       dfd.resolve();
-      this.set('stackConfigsLoaded', true);
     }
     return dfd.promise();
   },
 
+  /**
+   * Clear all config static data
+   * and theme info
+   *
+   * @method clearEnhancedConfigs
+   */
+  clearEnhancedConfigs: function() {
+    App.configsCollection.clearAll();
+    App.Section.find().clear();
+    App.SubSection.find().clear();
+    App.SubSectionTab.find().clear();
+    App.Tab.find().clear();
+    this.set('stackConfigsLoaded', false);
+  },
+
   /**
    * Cache "stepConfigs" to local storage in name value pairs
    * @param stepController

+ 4 - 4
ambari-web/app/controllers/wizard/step3_controller.js

@@ -1675,15 +1675,15 @@ App.WizardStep3Controller = Em.Controller.extend(App.ReloadPopupMixin, {
       return App.showConfirmationPopup(
         function () {
           self.set('confirmedHosts', self.get('bootHosts'));
-          App.router.nextBtnClickInProgress = true;
-          App.router.send('next');
+          App.set('router.nextBtnClickInProgress', true);
+          App.get('router').send('next');
         },
         Em.I18n.t('installer.step3.hostWarningsPopup.hostHasWarnings'));
     }
     else {
       this.set('confirmedHosts', this.get('bootHosts'));
-      App.router.nextBtnClickInProgress = true;
-      App.router.send('next');
+      App.set('router.nextBtnClickInProgress', true);
+      App.get('router').send('next');
     }
     return null;
   },

+ 1 - 2
ambari-web/app/routes/add_service_routes.js

@@ -122,8 +122,7 @@ module.exports = App.WizardRoute.extend({
       var wizardStep5Controller = router.get('wizardStep5Controller');
       wizardStep5Controller.clearRecommendations(); // Force reload recommendation between steps 1 and 2
       addServiceController.setDBProperty('recommendations', undefined);
-      addServiceController.set('stackConfigsLoaded', false);
-      App.configsCollection.clearAll();
+      addServiceController.clearEnhancedConfigs();
       router.transitionTo('step2');
     }
   }),

+ 3 - 5
ambari-web/app/routes/installer.js

@@ -163,8 +163,8 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
       var installerController = router.get('installerController');
       installerController.validateJDKVersion(function() {
         installerController.checkRepoURL(wizardStep1Controller).done(function () {
-          App.router.nextBtnClickInProgress = true;
-          router.transitionInProgress = true;
+          App.set('router.nextBtnClickInProgress', true);
+          router.set('transitionInProgress', true);
           installerController.setDBProperty('service', undefined);
           installerController.setStacks();
           installerController.clearInstallOptions();
@@ -279,8 +279,7 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
           recommendations: undefined,
           masterComponentHosts: undefined
         });
-        controller.set('stackConfigsLoaded', false);
-        App.configsCollection.clearAll();
+        controller.clearEnhancedConfigs();
         router.transitionTo('step5');
       }
       console.timeEnd('step4 next');
@@ -299,7 +298,6 @@ module.exports = Em.Route.extend(App.RouterRedirections, {
         servicesMasters: [],
         isInitialLayout: true
       });
-      controller.set('stackConfigsLoaded', false);
       controller.setCurrentStep('5');
       controller.loadAllPriorSteps().done(function () {
         controller.connectOutlet('wizardStep5', controller.get('content'));