Bläddra i källkod

AMBARI-3569. "Config" step refresh. (onechiporenko)

Oleg Nechiporenko 11 år sedan
förälder
incheckning
38569ba592

+ 3 - 0
ambari-web/app/controllers/main/service/add_controller.js

@@ -222,6 +222,9 @@ App.AddServiceController = App.WizardController.extend({
 
   loadServiceConfigProperties: function() {
     this._super();
+    if (!this.get('content.services')) {
+      this.loadServices();
+    }
     if (this.get('currentStep') > 1 && this.get('currentStep') < 6) {
       this.set('content.skipConfigStep', this.skipConfigStep());
       this.get('isStepDisabled').findProperty('step', 4).set('value', this.get('content.skipConfigStep'));

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

@@ -171,7 +171,6 @@ module.exports = Em.Route.extend({
         addServiceController.saveSlaveComponentHosts(wizardStep6Controller);
         addServiceController.get('content').set('serviceConfigProperties', null);
         App.db.setServiceConfigProperties(null);
-        addServiceController.loadAdvancedConfigs();
         router.transitionTo('step4');
       }
     }
@@ -185,6 +184,7 @@ module.exports = Em.Route.extend({
       controller.setCurrentStep('4');
       controller.dataLoading().done(function () {
         controller.loadAllPriorSteps();
+        controller.loadAdvancedConfigs();
         controller.connectOutlet('wizardStep7', controller.get('content'));
       })
     },