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

[FIX] Label widget rendering breaking on actual label elements/widgets (e.g. opportunities form) 

bzr revid: xmo@openerp.com-20110324210347-1tnqjpzu22zr0vzw
This commit is contained in:
Xavier Morel 2011-03-24 22:03:47 +01:00
parent d6979759fa
commit 73343295fa
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/base/static/openerp/base.xml
View File

@ -206,9 +206,10 @@
</div>
</t>
<t t-name="WidgetLabel">
<label t-att-for="widget['for'].element_id" t-att-title="widget['for'].help" style="display: block; text-align: right;" t-att-ondblclick="'console.log(\'' + widget['for'].element_id + '\', openerp.screen.' + widget['for'].element_id + ')'">
<t t-esc="widget['for'].string"/>
<span t-if="widget['for'].help">?</span>
<label t-att-for="widget.element_id" t-att-title="widget.help" style="display: block; text-align: right;"
t-att-ondblclick="'console.log(\'' + widget.element_id + '\', openerp.screen.' + widget.element_id + ')'">
<t t-esc="widget.string"/>
<span t-if="widget.help">?</span>
:
</label>
</t>

7
addons/base/static/openerp/js/base_views.js
View File

@ -690,6 +690,13 @@ openerp.base.WidgetLabel = openerp.base.Widget.extend({
this.template = "WidgetLabel";
this.colspan = 1;
},
render: function () {
if (this['for'] && this.type !== 'label') {
return QWeb.render(this.template, {widget: this['for']});
}
// Actual label widgets should not have a false and have type label
return QWeb.render(this.template, {widget: this});
}
});