summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2012-05-11 13:32:22 +0200
committerXavier Morel <xmo@openerp.com>2012-05-11 13:32:22 +0200
commitf3721bb43b8372308d4d838c6d8aa0ebd0e85eee (patch)
treebe2542f1c643bcf270b970f916289c7d2d4a75c0 /addons/web/static/src
parent872c87cc59be880cc7edd102982aa4663fc10bc3 (diff)
[FIX] bloody retarded shit from revid:nicolas.vanhoren@openerp.com-20120418145003-vk8kkfgyp0y94hzm
bzr revid: xmo@openerp.com-20120511113222-o4vj35vscnbebvh8
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/formats.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js
index 640ba4d5a93..2b527686ddd 100644
--- a/addons/web/static/src/js/formats.js
+++ b/addons/web/static/src/js/formats.js
@@ -111,7 +111,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) {
return value_if_empty === undefined ? '' : value_if_empty;
}
var l10n = _t.database.parameters;
- switch (descriptor.type || (descriptor.field && descriptor.field.type)) {
+ switch (descriptor.widget || descriptor.type || (descriptor.field && descriptor.field.type)) {
case 'id':
return value.toString();
case 'integer':
@@ -171,7 +171,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) {
case "":
return value_if_empty === undefined ? false : value_if_empty;
}
- switch (descriptor.type || (descriptor.field && descriptor.field.type)) {
+ switch (descriptor.widget || descriptor.type || (descriptor.field && descriptor.field.type)) {
case 'integer':
var tmp;
do {