Browse Source

AMBARI-9562 Kerberos Wizard: Configs are not displayed for Advanced tab on Configure Identities step. (ababiichuk)

aBabiichuk 10 years ago
parent
commit
e1114f57cf

+ 9 - 4
ambari-web/app/controllers/main/admin/kerberos/step4_controller.js

@@ -83,12 +83,17 @@ App.KerberosWizardStep4Controller = App.WizardStep7Controller.extend(App.AddSecu
    * @returns {[App.ServiceConfigCategory]}
    * @returns {[App.ServiceConfigCategory]}
    */
    */
   createCategoryForServices: function() {
   createCategoryForServices: function() {
-    var services = App.StackService.find().filter(function(s) {
-      return s.get('isInstalled') || (s.get('isSelected') && this.get('wizardController.name') == 'addServiceController');
-    }, this);
+    var services = [];
+    if (this.get('wizardController.name') == 'addServiceController') {
+      services = App.StackService.find().filter(function(item) {
+        return item.get('isInstalled') || item.get('isSelected');
+      });
+    } else {
+      services = App.Service.find();
+    }
     return services.map(function(item) {
     return services.map(function(item) {
       return App.ServiceConfigCategory.create({ name: item.get('serviceName'), displayName: item.get('displayName'), collapsedByDefault: true});
       return App.ServiceConfigCategory.create({ name: item.get('serviceName'), displayName: item.get('displayName'), collapsedByDefault: true});
-    })
+    });
   },
   },
 
 
   /**
   /**

+ 7 - 0
ambari-web/test/controllers/main/admin/kerberos/step4_controller_test.js

@@ -219,6 +219,12 @@ describe('App.KerberosWizardStep4Controller', function() {
       }
       }
     });
     });
     beforeEach(function() {
     beforeEach(function() {
+      sinon.stub(App.Service, 'find').returns([
+        Em.Object.create({
+          serviceName: 'HDFS',
+          displayName: 'HDFS'
+        })
+      ]);
       sinon.stub(App.StackService, 'find').returns([
       sinon.stub(App.StackService, 'find').returns([
         Em.Object.create({
         Em.Object.create({
           serviceName: 'HDFS',
           serviceName: 'HDFS',
@@ -235,6 +241,7 @@ describe('App.KerberosWizardStep4Controller', function() {
     });
     });
 
 
     afterEach(function() {
     afterEach(function() {
+      App.Service.find.restore();
       App.StackService.find.restore();
       App.StackService.find.restore();
     });
     });