AMBARI-13779. UI hangs due to JS error at Configure Kerberos page on Enable Kerberos wizard. (jaimin)

ambari-web/app/models/configs/objects/service_config_property.js

@@ -497,8 +497,14 @@ App.ServiceConfigProperty = Em.Object.extend({
     var description = this.get('description');
     var displayType = this.get('displayType');
     var additionalDescription = Em.I18n.t('services.service.config.password.additionalDescription');
-    if ('password' === displayType && !description.contains(additionalDescription)) {
-      description += '<br />' + additionalDescription;
+    if ('password' === displayType) {
+      if (description) {
+        if (!description.contains(additionalDescription)) {
+          description += '<br />' + additionalDescription;
+        }
+      } else {
+        description = additionalDescription;
+      }
     }
     this.set('description', description);
   }

ambari-web/test/models/configs/objects/service_config_property_test.js

@@ -508,6 +508,14 @@ describe('App.ServiceConfigProperty', function () {
       expect(subd).to.not.contain(extraMessage);
     });
 
+    it('should add extra-message to the description if description is not defined', function () {
+
+      serviceConfigProperty.set('description', undefined);
+      var extraMessage = Em.I18n.t('services.service.config.password.additionalDescription');
+      serviceConfigProperty.updateDescription();
+      expect(serviceConfigProperty.get('description')).to.contain(extraMessage);
+    });
+
   });
 
 });