Stefan Rijnhart (Therp) has proposed merging
lp:~openerp-community/openerp-web/stefan-therp_lp883445 into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
Related bugs:
Bug #883445 in OpenERP Web: "Form view: 'string' attribute on 'group' tag is
ignored"
https://bugs.launchpad.net/openerp-web/+bug/883445
For more details, see:
https://code.launchpad.net/~openerp-community/openerp-web/stefan-therp_lp883445/+merge/80737
This branch honours the 'string' attribute of a form view's 'group' tag. The
presence of a non-empty string attribute triggers the rendering of the group in
a bordered frame, labelled with the contents of the string attribute. This way,
the behaviour of the new web client is equal to that of the GTK client and the
old web client.
--
https://code.launchpad.net/~openerp-community/openerp-web/stefan-therp_lp883445/+merge/80737
Your team OpenERP Community is subscribed to branch
lp:~openerp-community/openerp-web/stefan-therp_lp883445.
=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js 2011-10-27 12:43:25 +0000
+++ addons/web/static/src/js/view_form.js 2011-10-29 17:36:24 +0000
@@ -926,6 +926,10 @@
}
});
+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.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',
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2011-10-27 12:43:25 +0000
+++ addons/web/static/src/xml/base.xml 2011-10-29 17:36:24 +0000
@@ -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">
_______________________________________________
Mailing list: https://launchpad.net/~openerp-community
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-community
More help : https://help.launchpad.net/ListHelp
