diff options
| author | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-06-28 19:23:04 +0200 |
|---|---|---|
| committer | niv-openerp <nicolas.vanhoren@openerp.com> | 2011-06-28 19:23:04 +0200 |
| commit | 6cf3210c9b630e032fcf3f28e77ec23abe4e2d13 (patch) | |
| tree | 87e1dd204069cba77429c4ed33580cb88e3a25ad /addons/base/static/src/js/form.js | |
| parent | 31e7760e1a49f2d995e8ccb6b420eacc3606fb18 (diff) | |
| parent | f07f60b3da21fa6980ae7b29af2c2bdf180adc60 (diff) | |
[merge]
bzr revid: nicolas.vanhoren@openerp.com-20110628172304-8l1kzi2dwve83dj1
Diffstat (limited to 'addons/base/static/src/js/form.js')
| -rw-r--r-- | addons/base/static/src/js/form.js | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/addons/base/static/src/js/form.js b/addons/base/static/src/js/form.js index cc7993e210e..d279eb5d3aa 100644 --- a/addons/base/static/src/js/form.js +++ b/addons/base/static/src/js/form.js @@ -677,12 +677,18 @@ openerp.base.form.WidgetButton = openerp.base.form.Widget.extend({ openerp.base.form.WidgetLabel = openerp.base.form.Widget.extend({ init: function(view, node) { - this.is_field_label = true; this.element_name = 'label_' + node.attrs.name; this._super(view, node); - this.template = "WidgetLabel"; + // TODO fme: support for attrs.align + if (this.node.tag == 'label' && this.node.attrs.colspan) { + this.is_field_label = false; + this.template = "WidgetParagraph"; + } else { + this.is_field_label = true; + this.template = "WidgetLabel"; + } this.colspan = 1; }, render: function () { |