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

[FIX] Form layout. Allocated space for labels should be computed with original field widget's colspan 

bzr revid: fme@openerp.com-20110713151816-6hkid04t2tlarq9d
This commit is contained in:
Fabien Meghazi 2011-07-13 17:18:16 +02:00
parent 595496206c
commit ab755d5000
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/base/static/src/js/form.js
View File

@ -614,14 +614,15 @@ openerp.base.form.WidgetFrame = openerp.base.form.Widget.extend({
if (node.attrs.nolabel != '1') {
var label = new (this.view.registry.get_object('label')) (this.view, node);
label["for"] = widget;
this.add_widget(label);
this.add_widget(label, widget.colspan + 1);
}
}
this.add_widget(widget);
},
add_widget: function(widget) {
add_widget: function(widget, colspan) {
colspan = colspan || widget.colspan;
var current_row = this.table[this.table.length - 1];
if (current_row.length && (this.x + widget.colspan) > this.columns) {
if (current_row.length && (this.x + colspan) > this.columns) {
current_row = this.add_row();
}
current_row.push(widget);