From 6f56399af262be6f37fbc4b4ffd9d926d32e2454 Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Tue, 12 Apr 2016 00:47:27 +0200
Subject: [PATCH] Fixed column_select with integer values.

---
 .../app/lib/app_post/column_select.coffee            |  2 +-
 public/assets/tests/form_column_select.js            | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/app/lib/app_post/column_select.coffee b/app/assets/javascripts/app/lib/app_post/column_select.coffee
index cbbb84178..d58354f5d 100644
--- a/app/assets/javascripts/app/lib/app_post/column_select.coffee
+++ b/app/assets/javascripts/app/lib/app_post/column_select.coffee
@@ -37,7 +37,7 @@ class App.ColumnSelect extends Spine.Controller
     @values = []
     _.each @options.attribute.options, (option) =>
       if option.selected
-        @values.push option.value
+        @values.push option.value.toString()
 
     @html App.view('generic/column_select')
       attribute: @options.attribute
diff --git a/public/assets/tests/form_column_select.js b/public/assets/tests/form_column_select.js
index 85b5a0f9b..9670678ae 100644
--- a/public/assets/tests/form_column_select.js
+++ b/public/assets/tests/form_column_select.js
@@ -5,11 +5,14 @@ test( "column_select check", function(assert) {
   var el = $('#form1')
   var defaults = {
     column_select2: ['aaa', 'bbb'],
+    column_select3: [1, '2'],
   }
   var options = {
     'aaa': 'aaa display',
     'bbb': 'bbb display',
     'ccc': 'ccc display',
+    1: '1 display',
+    '2': '2 display',
   }
   new App.ControllerForm({
     el: el,
@@ -17,6 +20,7 @@ test( "column_select check", function(assert) {
       configure_attributes: [
         { name: 'column_select1', display: 'ColumnSelect1', tag: 'column_select', options: options, null: true, default: defaults['column_select1'] },
         { name: 'column_select2', display: 'ColumnSelect2', tag: 'column_select', options: options, null: false, default: defaults['column_select2'] },
+        { name: 'column_select3', display: 'ColumnSelect3', tag: 'column_select', options: options, null: false, default: defaults['column_select3'] },
       ]
     },
     autofocus: true
@@ -25,6 +29,7 @@ test( "column_select check", function(assert) {
   var params = App.ControllerForm.params(el)
   var test_params = {
     column_select2: ['aaa', 'bbb'],
+    column_select3: ['1', '2'],
   }
   deepEqual(params, test_params, 'form param check')
 
@@ -35,19 +40,22 @@ test( "column_select check", function(assert) {
   test_params = {
     column_select1: 'bbb',
     column_select2: ['aaa', 'bbb'],
+    column_select3: ['1', '2'],
   }
   deepEqual(params, test_params, 'form param check')
 
   var done = assert.async();
   setTimeout(function() {
     $('[data-name="column_select1"] .js-pool .js-option[data-value="aaa"]').click()
-    $('[data-name="column_select2"] .js-pool .js-option[data-value="ccc"]').click()
+    $('[data-name="column_select2"] .js-pool .js-option[data-value="1"]').click()
     $('[data-name="column_select2"].js-selected .js-option[data-value="aaa"]').click()
+    $('[data-name="column_select3"] .js-pool .js-option[data-value="aaa"]').click()
 
     params = App.ControllerForm.params(el)
     test_params = {
       column_select1: ['aaa', 'bbb'],
-      column_select2: ['bbb', 'ccc'],
+      column_select2: ['1', 'bbb'],
+      column_select3: ['1', '2', 'aaa'],
     }
     deepEqual(params, test_params, 'form param check')
     done();