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

[FIX] Special case id fields 

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

bzr revid: fme@openerp.com-20120125111628-vsz6mwptd7bm8hlm
This commit is contained in:
Fabien Meghazi 2012-01-25 12:16:28 +01:00
parent 82b7eb4951
commit 4ffe5f5545
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web/controllers/main.py
View File

@ -965,6 +965,10 @@ class View(openerpweb.Controller):
xml = ElementTree.fromstring(arch)
fvg['arch'] = common.xml2json.from_elementtree(xml, preserve_whitespaces)
if 'id' in fvg['fields']:
# Special case for id's
fvg['fields']['id']['type'] = 'id'
for field in fvg['fields'].itervalues():
if field.get('views'):
for view in field["views"].itervalues():

2
addons/web/static/src/js/formats.js
View File

@ -90,6 +90,8 @@ openerp.web.format_value = function (value, descriptor, value_if_empty) {
}
var l10n = _t.database.parameters;
switch (descriptor.widget || descriptor.type) {
case 'id':
return value.toString();
case 'integer':
return openerp.web.insert_thousand_seps(
_.str.sprintf('%d', value));

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

@ -3227,6 +3227,7 @@ openerp.web.form.widgets = new openerp.web.Registry({
'label' : 'openerp.web.form.WidgetLabel',
'button' : 'openerp.web.form.WidgetButton',
'char' : 'openerp.web.form.FieldChar',
'id' : 'openerp.web.form.FieldChar',
'email' : 'openerp.web.form.FieldEmail',
'url' : 'openerp.web.form.FieldUrl',
'text' : 'openerp.web.form.FieldText',

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

@ -245,6 +245,7 @@ openerp.web.page = function (openerp) {
openerp.web.page.readonly = openerp.web.form.widgets.clone({
'frame': 'openerp.web.page.WidgetFrameReadonly',
'char': 'openerp.web.page.FieldCharReadonly',
'id': 'openerp.web.page.FieldCharReadonly',
'email': 'openerp.web.page.FieldEmailReadonly',
'url': 'openerp.web.page.FieldUrlReadonly',
'text': 'openerp.web.page.FieldCharReadonly',