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

[IMP] Form view: honours 'string' attribute on 'group' tag 

lp bug: https://launchpad.net/bugs/883445 fixed

bzr revid: stefan@therp.nl-20111029172354-gryhpp17e3nr4rr8
This commit is contained in:
Stefan Rijnhart 2011-10-29 19:23:54 +02:00
parent 04b619f7bb
commit 93d35328dc
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web/static/src/js/view_form.js
View File

@ -926,6 +926,10 @@ openerp.web.form.WidgetNotebook = openerp.web.form.Widget.extend({
}
});
openerp.web.form.WidgetGroupFrame = openerp.web.form.WidgetFrame.extend({
template: 'WidgetGroupFrame',
}),
openerp.web.form.WidgetNotebookPage = openerp.web.form.WidgetFrame.extend({
template: 'WidgetNotebookPage',
init: function(view, node, notebook, index) {
@ -3002,7 +3006,7 @@ openerp.web.form.FieldMany2OneReadonly = openerp.web.form.FieldCharReadonly.exte
*/
openerp.web.form.widgets = new openerp.web.Registry({
'frame' : 'openerp.web.form.WidgetFrame',
'group' : 'openerp.web.form.WidgetFrame',
'group' : 'openerp.web.form.WidgetGroupFrame',
'notebook' : 'openerp.web.form.WidgetNotebook',
'notebookpage' : 'openerp.web.form.WidgetNotebookPage',
'separator' : 'openerp.web.form.WidgetSeparator',

11
addons/web/static/src/xml/base.xml
View File

@ -728,6 +728,17 @@
</tr>
</table>
</t>
<t t-name="WidgetGroupFrame">
<t t-if="widget.string">
<fieldset>
<legend><t t-esc="widget.string"/></legend>
<t t-call="WidgetFrame"/>
</fieldset>
</t>
<t t-if="!widget.string">
<t t-call="WidgetFrame"/>
</t>
</t>
<t t-name="WidgetNotebook">
<ul>
<li t-foreach="widget.pages" t-as="page">