odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] @digits not honored by form view. field#digits not honored by page view. 

lp bug: https://launchpad.net/bugs/943273 fixed

bzr revid: fme@openerp.com-20120305195800-uoiu74ee1rfm4tex
This commit is contained in:
Fabien Meghazi 2012-03-05 20:58:00 +01:00
parent d9a626a32c
commit 542a6e9a67
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/web/static/src/js/view_form.js
View File

@ -1526,16 +1526,11 @@ openerp.web.form.FieldFloat = openerp.web.form.FieldChar.extend({
init: function (view, node) {
this._super(view, node);
if (node.attrs.digits) {
this.parse_digits(node.attrs.digits);
this.digits = py.eval(node.attrs.digits).toJSON();
} else {
this.digits = view.fields_view.fields[node.attrs.name].digits;
}
},
parse_digits: function (digits_attr) {
// could use a Python parser instead.
var match = /^\s*[\(\[](\d+),\s*(\d+)/.exec(digits_attr);
return [parseInt(match[1], 10), parseInt(match[2], 10)];
},
set_value: function(value) {
if (value === false || value === undefined) {
// As in GTK client, floats default to 0

12
addons/web/static/src/js/view_page.js
View File

@ -89,6 +89,16 @@ openerp.web.page = function (openerp) {
return show_value;
}
});
openerp.web.page.FieldFloatReadonly = openerp.web.page.FieldCharReadonly.extend({
init: function (view, node) {
this._super(view, node);
if (node.attrs.digits) {
this.digits = py.eval(node.attrs.digits).toJSON();
} else {
this.digits = view.fields_view.fields[node.attrs.name].digits;
}
}
});
openerp.web.page.FieldURIReadonly = openerp.web.page.FieldCharReadonly.extend({
template: 'FieldURI.readonly',
scheme: null,
@ -269,7 +279,7 @@ openerp.web.page = function (openerp) {
'one2many_list' : 'openerp.web.page.FieldOne2ManyReadonly',
'reference': 'openerp.web.page.FieldReferenceReadonly',
'boolean': 'openerp.web.page.FieldBooleanReadonly',
'float': 'openerp.web.page.FieldCharReadonly',
'float': 'openerp.web.page.FieldFloatReadonly',
'integer': 'openerp.web.page.FieldCharReadonly',
'float_time': 'openerp.web.page.FieldCharReadonly',
'binary': 'openerp.web.page.FieldBinaryFileReadonly',