Quellcode durchsuchen

AMBARI-17038. Enable kerberos wizard UI showing incorrect total of required fields. (jaimin)

Jaimin Jetly vor 9 Jahren
Ursprung
Commit
735f68d357

+ 1 - 1
ambari-web/app/models/configs/objects/service_config.js

@@ -46,7 +46,7 @@ App.ServiceConfig = Ember.Object.extend({
    */
   activeProperties: function() {
     return this.get('configs').filter(function(c) {
-      return c.get('isVisible') && !c.get('hiddenBySection') && c.get('isRequiredByAgent');
+      return c.get('isVisible') && !c.get('hiddenBySection') && (c.get('isRequiredByAgent') || c.get('isRequired'));
     });
   }.property('configs.@each.isVisible', 'configs.@each.hiddenBySection', 'configs.@each.isRequiredByAgent'),
 

+ 12 - 3
ambari-web/test/models/configs/objects/service_config_test.js

@@ -69,6 +69,15 @@ var serviceConfig,
       'isRequiredByAgent': false,
       'isValid': true,
       'isValidOverride': false
+    }),
+    Em.Object.create({
+      'name': 'p7',
+      'isVisible': true,
+      'hiddenBySection': false,
+      'isRequiredByAgent': false,
+      'isValid': true,
+      'isRequired': true,
+      'isValidOverride': false
     })
   ];
 
@@ -82,14 +91,14 @@ describe('App.ServiceConfig', function () {
 
   describe('#activeProperties', function() {
     it('returns collection of properties that should be shown', function() {
-      expect(serviceConfig.get('activeProperties').mapProperty('name')).to.be.eql(['p1','p4','p5']);
+      expect(serviceConfig.get('activeProperties').mapProperty('name')).to.be.eql(['p1','p4','p5','p7']);
     });
   });
 
   describe('#configsWithErrors', function() {
     it('returns collection of properties with errors', function() {
-      expect(serviceConfig.get('configsWithErrors').mapProperty('name')).to.be.eql(['p4', 'p5']);
-    })
+      expect(serviceConfig.get('configsWithErrors').mapProperty('name')).to.be.eql(['p4', 'p5', 'p7']);
+    });
   });
 
   describe('#errorCount', function() {