Browse Source

AMBARI-4003 Add Service Wizard: Customize Services configs are not displayed. (Denys Buzhor via atkach)

atkach 11 years ago
parent
commit
aafadc5d50

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

@@ -311,14 +311,6 @@ App.InstallerController = App.WizardController.extend({
 
     this.set('content.advancedServiceConfig', this.getDBProperty('advancedServiceConfig'));
   },
-  /**
-   * Load config groups from local DB
-   */
-  loadServiceConfigGroups: function () {
-    var serviceConfigGroups = this.getDBProperty('serviceConfigGroups') || [];
-    this.set('content.configGroups', serviceConfigGroups);
-    console.log("InstallerController.configGroups: loaded config ", serviceConfigGroups);
-  },
 
   /**
    * Load information about hosts with clients components

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

@@ -51,7 +51,8 @@ App.AddServiceController = App.WizardController.extend({
     masterComponentHosts: null,
     serviceConfigProperties: null,
     advancedServiceConfig: null,
-    controllerName: 'addServiceController'
+    controllerName: 'addServiceController',
+    configGroups: []
   }),
 
   setCurrentStep: function (currentStep, completed) {
@@ -388,6 +389,7 @@ App.AddServiceController = App.WizardController.extend({
       case '5':
         this.load('cluster');
       case '4':
+        this.loadServiceConfigGroups();
         this.loadServiceConfigProperties();
       case '3':
         this.loadServices();

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

@@ -518,6 +518,14 @@ App.WizardController = Em.Controller.extend({
     this.set('content.services', apiService);
     this.setDBProperty('service',apiService);
   },
+  /**
+   * Load config groups from local DB
+   */
+  loadServiceConfigGroups: function () {
+    var serviceConfigGroups = this.getDBProperty('serviceConfigGroups') || [];
+    this.set('content.configGroups', serviceConfigGroups);
+    console.log("InstallerController.configGroups: loaded config ", serviceConfigGroups);
+  },
 
   registerErrPopup: function (header, message) {
     App.ModalPopup.show({
@@ -760,4 +768,4 @@ App.WizardController = Em.Controller.extend({
     this.setDBProperty('serviceConfigGroups', serviceConfigGroups);
     this.set('content.serviceConfigProperties', serviceConfigGroups);
   }
-});
+});

+ 3 - 0
ambari-web/app/routes/add_service_routes.js

@@ -205,6 +205,9 @@ module.exports = Em.Route.extend({
       var addServiceController = router.get('addServiceController');
       var wizardStep7Controller = router.get('wizardStep7Controller');
       addServiceController.saveServiceConfigProperties(wizardStep7Controller);
+      if (App.supports.hostOverrides) {
+        addServiceController.saveServiceConfigGroups(wizardStep7Controller);
+      }
       router.transitionTo('step5');
     }
   }),