[IMP] display string label of selection and m2o fields in defaults-setting dialog

bzr revid: xmo@openerp.com-20120209151410-49j13cfbrwwhrp23

1 files changed, 15 insertions, 0 deletions

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index ba1f885d2e6..5eec08a45f6 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -655,10 +655,25 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
                         || field.field.type === 'many2many') {
                     return false;
                 }
+                var displayed;
+                switch(field.field.type) {
+                case 'selection':
+                    displayed = _(field.values).find(function (option) {
+                            return option[0] === value;
+                        })[1];
+                    break;
+                case 'many2one':
+                    displayed = field.value[1] || value;
+                    break;
+                default:
+                    displayed = value;
+                }
+
                 return {
                     name: name,
                     string: field.string,
                     value: value,
+                    displayed: displayed,
                     // convert undefined to false
                     change_default: !!field.field.change_default
                 }