From ab755d5000ca96eb3f6684851d5676b153bbd58d Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Wed, 13 Jul 2011 17:18:16 +0200 Subject: [PATCH] [FIX] Form layout. Allocated space for labels should be computed with original field widget's colspan bzr revid: fme@openerp.com-20110713151816-6hkid04t2tlarq9d --- addons/base/static/src/js/form.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index 15154ddd961..60511c49c17 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -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);