AMBARI-2299. Custom config UI need to be compatible with multi-line values. (Oleg Nechiporenko via yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1490420 13f79535-47bb-0310-9956-ffa450edef68

ambari-web/app/models/service_config.js

@@ -427,6 +427,9 @@ App.ServiceConfigProperty = Ember.Object.extend({
       case 'directories':
         return App.ServiceConfigTextArea;
         break;
+      case 'multiLine':
+        return App.ServiceConfigTextArea;
+        break;
       case 'custom':
         return App.ServiceConfigBigTextArea;
       case 'masterHost':

ambari-web/app/utils/config.js

@@ -194,7 +194,7 @@ App.config = Em.Object.create({
         } else if (!this.get('configMapping').computed().someProperty('name', index)) {
           isAdvanced = advancedConfigs.someProperty('name', index);
           serviceConfigObj.id = 'site property';
-          serviceConfigObj.displayType = 'advanced';
+          serviceConfigObj.displayType = stringUtils.isSingleLine(serviceConfigObj.value) ? 'advanced' : 'multiLine';
           serviceConfigObj.displayName = configsPropertyDef ? configsPropertyDef.displayName : index;
           this.calculateConfigProperties(serviceConfigObj, isAdvanced, advancedConfigs);
           configs.push(serviceConfigObj);
@@ -245,7 +245,7 @@ App.config = Em.Object.create({
           serviceName: stored.serviceName,
           value: stored.value,
           defaultValue: stored.defaultValue,
-          displayType: "advanced",
+          displayType: stringUtils.isSingleLine(stored.value) ? 'advanced' : 'multiLine',
           filename: stored.filename,
           category: 'Advanced',
           isUserProperty: stored.isUserProperty === true,

ambari-web/app/utils/string_utils.js

@@ -101,5 +101,9 @@ module.exports = {
       i++;
     }
     return result;
+  },
+
+  isSingleLine: function(string){
+    return string.trim().indexOf("\n") == -1;
   }
 }

ambari-web/app/views/common/configs/services_config.js

@@ -18,6 +18,7 @@
 
 var App = require('app');
 var validator = require('utils/validator');
+var stringUtils = require('utils/string_utils');
 
 App.ServicesConfigView = Em.View.extend({
   templateName: require('templates/common/configs/services_config'),
@@ -220,7 +221,7 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({
     if (categoryMetaData != null) {
       serviceConfigObj.filename = categoryMetaData.siteFileName;
     }
-    
+
     var self = this;
     App.ModalPopup.show({
       // classNames: ['big-modal'],
@@ -237,6 +238,7 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({
           serviceConfigObj.displayName = serviceConfigObj.name;
           serviceConfigObj.id = 'site property';
           serviceConfigObj.serviceName = serviceName;
+          serviceConfigObj.displayType = stringUtils.isSingleLine(serviceConfigObj.get('value')) ? 'advanced' : 'multiLine';
           var serviceConfigProperty = App.ServiceConfigProperty.create(serviceConfigObj);
           self.get('controller.secureConfigs').filterProperty('filename',self.get('category.siteFileName')).forEach(function(_secureConfig){
             if(_secureConfig.name === serviceConfigProperty.get('name')) {
@@ -258,7 +260,7 @@ App.ServiceConfigsByCategoryView = Ember.View.extend({
     });
 
   },
-  
+
   /**
    * Removes the top-level property from list of properties.
    * Should be only called on user properties.