AMBARI-11792 Add Service: configs step is not loaded after enabling kerberos. (ababiichuk)

ambari-web/app/controllers/wizard/step7_controller.js

@@ -667,8 +667,8 @@ App.WizardStep7Controller = Em.Controller.extend(App.ServerValidatorMixin, App.E
       }
     }, this);
     //STEP 6: Distribute configs by service and wrap each one in App.ServiceConfigProperty (configs -> serviceConfigs)
-    if (this.get('securityEnabled') && self.get('wizardController.name') == 'addServiceController') {
-      this.addKerberosDescriptorConfigs(configs, self.get('wizardController.kerberosDescriptorConfigs') || []);
+    if (this.get('securityEnabled') && this.get('wizardController.name') == 'addServiceController') {
+      this.addKerberosDescriptorConfigs(configs, this.get('wizardController.kerberosDescriptorConfigs') || []);
     }
     this.setStepConfigs(configs, storedConfigs);
     this.checkHostOverrideInstaller();

ambari-web/app/mixins/common/configs/enhanced_configs.js

@@ -107,7 +107,7 @@ App.EnhancedConfigsMixin = Em.Mixin.create({
   changedProperties: function() {
     return this.get('_dependentConfigValues').filter(function(dp) {
       return (this.get('selectedConfigGroup.isDefault') && Em.get(dp, 'configGroup').contains('Default'))
-        || [this.get('selectedConfigGroup.name'), this.get('selectedConfigGroup.dependentConfigGroups')[Em.get(dp, 'serviceName')]].contains(Em.get(dp, 'configGroup'));
+        || [this.get('selectedConfigGroup.name'), this.get('selectedConfigGroup.dependentConfigGroups') && this.get('selectedConfigGroup.dependentConfigGroups')[Em.get(dp, 'serviceName')]].contains(Em.get(dp, 'configGroup'));
     }, this);
   }.property('_dependentConfigValues.@each.saveRecommended', 'selectedConfigGroup'),