浏览代码

AMBARI-2808. Can't add from UI some queues in capacity-scheduler.xml. (Dmytro Shkvyra via yusaku)

Yusaku Sako 12 年之前
父节点
当前提交
746d98f722
共有 2 个文件被更改,包括 5 次插入7 次删除
  1. 1 1
      ambari-web/app/utils/config.js
  2. 4 6
      ambari-web/test/utils/config_test.js

+ 1 - 1
ambari-web/app/utils/config.js

@@ -827,7 +827,7 @@ App.config = Em.Object.create({
   textareaIntoFileConfigs: function(configs, filename){
     var complexConfigName = this.get('complexConfigs').findProperty('filename', filename).name;
     var configsTextarea = configs.findProperty('name', complexConfigName);
-    var properties = configsTextarea.get('value').replace(/(,| |\n)+/g, ',').split(',');
+    var properties = configsTextarea.get('value').replace(/( |\n)+/g, '\n').split('\n');
 
     properties.forEach(function(_property){
       var name, value;

+ 4 - 6
ambari-web/test/utils/config_test.js

@@ -192,7 +192,7 @@ describe('App.config', function () {
       {
         configs: [Em.Object.create({
           "name": "capacity-scheduler",
-          "value": "config1=value1,config2=value2\n",
+          "value": "config1=value1,value2\n",
           "filename": "capacity-scheduler.xml"
         })]
       },
@@ -219,13 +219,11 @@ describe('App.config', function () {
       expect(result[1].value).to.equal('value2');
       expect(result[1].name).to.equal('config2');
     });
-    it('config1=value1,config2=value2 to two configs', function () {
+    it('config1=value1,value2\n to one config', function () {
       var result = App.config.textareaIntoFileConfigs.call(App.config, testData[2].configs, filename);
-      expect(result.length).to.equal(2);
-      expect(result[0].value).to.equal('value1');
+      expect(result.length).to.equal(1);
+      expect(result[0].value).to.equal('value1,value2');
       expect(result[0].name).to.equal('config1');
-      expect(result[1].value).to.equal('value2');
-      expect(result[1].name).to.equal('config2');
     });
     it('config1=value1 config2=value2 to two configs', function () {
       var result = App.config.textareaIntoFileConfigs.call(App.config, testData[3].configs, filename);