From 5632e326c31e89ec2f7ecce7917778acc2d44c15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Krier?= <ced@b2ck.com>
Date: Wed, 29 Oct 2014 00:18:48 +0100
Subject: [PATCH] stringify the value of selection to preserve types

review8681002
---
 src/model.js |  5 +----
 src/view.js  | 25 ++++---------------------
 2 files changed, 5 insertions(+), 25 deletions(-)

diff --git a/src/model.js b/src/model.js
index a4072b4a40..720dac79c9 100644
--- a/src/model.js
+++ b/src/model.js
@@ -1232,10 +1232,7 @@
     });
 
     Sao.field.Selection = Sao.class_(Sao.field.Field, {
-        _default: null,
-        get_client: function(record) {
-            return record._values[this.name];
-        }
+        _default: null
     });
 
     Sao.field.DateTime = Sao.class_(Sao.field.Field, {
diff --git a/src/view.js b/src/view.js
index 054058721f..4b6bf514da 100644
--- a/src/view.js
+++ b/src/view.js
@@ -2053,7 +2053,7 @@
             select.empty();
             selection.forEach(function(e) {
                 select.append(jQuery('<option/>', {
-                    'value': e[0],
+                    'value': JSON.stringify(e[0]),
                     'text': e[1]
                 }));
             });
@@ -2077,7 +2077,7 @@
                         .call(this, value);
                     prm.done(function(inactive) {
                         this.select.append(jQuery('<option/>', {
-                            value: inactive[0],
+                            value: JSON.stringify(inactive[0]),
                             text: inactive[1],
                             disabled: true
                         }));
@@ -2086,10 +2086,7 @@
                     prm = jQuery.when();
                 }
                 prm.done(function() {
-                    if (value === null) {
-                        value = '';
-                    }
-                    this.select.val('' + value);
+                    this.select.val(JSON.stringify(value));
                 }.bind(this));
             }.bind(this));
         },
@@ -2098,21 +2095,7 @@
             this.display_update_selection(record, field);
         },
         value_get: function() {
-            var val = this.select.val();
-            // Some selection widgets use integer instead of string
-            var is_integer = (this.selection || []).some(function(e) {
-                return typeof(e[0]) == 'number';
-            });
-            if (('relation' in this.attributes) || is_integer) {
-                if (val === '') {
-                    return null;
-                } else if (val === null) {
-                    // The selected value is disabled
-                    val = this.select.find(':selected').attr('value');
-                }
-                return parseInt(val, 10);
-            }
-            return val;
+            return JSON.parse(this.select.val());
         },
         set_value: function(record, field) {
             var value = this.value_get();