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

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

bzr revid: stefan@therp.nl-20111029172354-gryhpp17e3nr4rr8

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6f499a0..38c99a6 100644 (file)
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -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',

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 8984daf..c7dd21f 100644 (file)
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -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">