summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2011-03-16 15:37:53 +0100
committerFabien Meghazi <fme@openerp.com>2011-03-16 15:37:53 +0100
commit195d5aef8b8aab8f7fa5fe629ee60f488f1ca710 (patch)
tree4d9faf50e182653685cac7b3ed40ef82ae6010fc
parentac35ee9ec460c1eac08558bd3c2bba92bdd217af (diff)
[FIX] label for attribute
bzr revid: fme@openerp.com-20110316143753-vlrvls0qmtz27iaw
-rw-r--r--addons/base/static/openerp/base.xml2
-rw-r--r--addons/base/static/openerp/js/controllers.js3
2 files changed, 3 insertions, 2 deletions
diff --git a/addons/base/static/openerp/base.xml b/addons/base/static/openerp/base.xml
index 434759f49dc..1b295cf4cab 100644
--- a/addons/base/static/openerp/base.xml
+++ b/addons/base/static/openerp/base.xml
@@ -179,7 +179,7 @@
</div>
</t>
<t t-name="FormView.label">
- <label t-att-for="widget.element_id" t-att-title="widget.help" style="display: block; text-align: right;" t-att-ondblclick="'console.log(openerp.screen.oe_main.formview.widgets[\'' + widget.element_id + '\'])'">
+ <label t-att-for="widget.for.element_id" t-att-title="widget.help" style="display: block; text-align: right;" t-att-ondblclick="'console.log(openerp.screen.oe_main.formview.widgets[\'' + widget.element_id + '\'])'">
<t t-esc="widget.string"/>
<span t-if="widget.help">?</span>
:
diff --git a/addons/base/static/openerp/js/controllers.js b/addons/base/static/openerp/js/controllers.js
index 8a4cf10baba..4727495b8c1 100644
--- a/addons/base/static/openerp/js/controllers.js
+++ b/addons/base/static/openerp/js/controllers.js
@@ -532,11 +532,12 @@ openerp.base.WidgetFrame = openerp.base.Widget.extend({
var type = this.view.fields_view.fields[n.attrs.name] || {};
var widget_type = n.attrs.widget || type.type || n.tag;
if (openerp.base.widgets[widget_type]) {
+ var widget = new openerp.base.widgets[widget_type](this.session, null, this.view, n);
if (n.tag == 'field' && n.attrs.nolabel != '1') {
var label = new openerp.base.widgets['label'](this.session, null, this.view, n);
+ label["for"] = widget;
this.add_widget(label);
}
- var widget = new openerp.base.widgets[widget_type](this.session, null, this.view, n);
this.add_widget(widget);
} else {
console.log("Unhandled widget type : " + widget_type, n);