瀏覽代碼

AMBARI-11276. All properties were added to config group per site.xml on Install Wizard. (onechiporenko)

Oleg Nechiporenko 10 年之前
父節點
當前提交
d1e4b6b012

+ 0 - 2
ambari-web/app/controllers/main/service/info/configs.js

@@ -372,7 +372,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
    * @method onConfigGroupChange
    */
   onConfigGroupChange: function () {
-    console.time('!!!!!!!!!');
     var self = this;
     this.get('stepConfigs').clear();
     var selectedConfigGroup = this.get('selectedConfigGroup');
@@ -421,7 +420,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ServerValidatorM
         } else {
           self.onLoadOverrides(self.get('allConfigs'));
         }
-        console.timeEnd('!!!!!!!!!');
       });
     });
   }.observes('selectedConfigGroup'),

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

@@ -1553,7 +1553,7 @@ App.WizardStep8Controller = Em.Controller.extend(App.AddSecurityConfigs, App.wiz
     });
 
     return sites.map(function (site) {
-      return this.createSiteObj(site.type, site.tag, site.properties);
+      return App.router.get('mainServiceInfoConfigsController').createSiteObj(site.type, site.tag, site.properties);
     }, this);
   },
 

+ 2 - 1
ambari-web/test/controllers/wizard/step8_test.js

@@ -329,7 +329,8 @@ describe('App.WizardStep8Controller', function () {
         },
         getConfigAttributes: function() {
           return Em.A(['atr']);
-        }
+        },
+        createSiteObj: App.MainServiceInfoConfigsController.create({}).createSiteObj.bind(App.MainServiceInfoConfigsController.create({}))
       }));
     });
     afterEach(function() {