Przeglądaj źródła

AMBARI-6873. Incorrect behavior of "Configurations" page in Add Host wizard (Max Shepel via alexantonenko)

Alex Antonenko 10 lat temu
rodzic
commit
c26968df46

+ 3 - 2
ambari-web/app/controllers/main/host/add_controller.js

@@ -254,12 +254,13 @@ App.AddHostController = App.WizardController.extend({
         if (slave.hosts.length > 0) {
           if (slave.componentName !== "CLIENT") {
             var service = App.StackServiceComponent.find(slave.componentName).get('stackService');
-            var configGroups = this.get('content.configGroups').filterProperty('ConfigGroup.tag', service);
+            var serviceName = service.get('serviceName');
+            var configGroups = this.get('content.configGroups').filterProperty('ConfigGroup.tag', serviceName);
             var configGroupsNames = configGroups.mapProperty('ConfigGroup.group_name');
             var defaultGroupName = service.get('displayName') + ' Default';
             configGroupsNames.unshift(defaultGroupName);
             selectedServices.push({
-              serviceId: service.get('serviceName'),
+              serviceId: serviceName,
               displayName: service.get('displayName'),
               hosts: slave.hosts.mapProperty('hostName'),
               configGroupsNames: configGroupsNames,

+ 1 - 0
ambari-web/app/routes/add_host_routes.js

@@ -211,6 +211,7 @@ module.exports = App.WizardRoute.extend({
       var addHostStep4Controller = router.get('addHostStep4Controller');
       controller.setCurrentStep('4');
       addHostStep4Controller.loadConfigGroups();
+      addHostStep4Controller.set('isConfigGroupLoaded', false);
       addHostStep4Controller.configGroupsLoading().done(function () {
         controller.dataLoading().done(function () {
           controller.loadAllPriorSteps();