From 93d35328dc17586a4dbc0e6a1428df63ebe610c1 Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Sat, 29 Oct 2011 19:23:54 +0200
Subject: [PATCH 1/2] [IMP] Form view: honours 'string' attribute on 'group'
 tag

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

bzr revid: stefan@therp.nl-20111029172354-gryhpp17e3nr4rr8
---
 addons/web/static/src/js/view_form.js |  6 +++++-
 addons/web/static/src/xml/base.xml    | 11 +++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 6f499a0adf7..38c99a657f8 100644
--- 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 8984daffeb3..c7dd21f7784 100644
--- 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">

From c2d42b09682682afa25602b057b7429e0c0c04dc Mon Sep 17 00:00:00 2001
From: Stefan Rijnhart <stefan@therp.nl>
Date: Thu, 10 Nov 2011 11:10:06 +0100
Subject: [PATCH 2/2] [FIX] Changed widget name to WidgetGroup as per
 convention

bzr revid: stefan@therp.nl-20111110101006-czp6fferclxlz8v8
---
 addons/web/static/src/js/view_form.js | 6 +++---
 addons/web/static/src/xml/base.xml    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js
index 38c99a657f8..b0565a96e57 100644
--- a/addons/web/static/src/js/view_form.js
+++ b/addons/web/static/src/js/view_form.js
@@ -926,8 +926,8 @@ openerp.web.form.WidgetNotebook = openerp.web.form.Widget.extend({
     }
 });
 
-openerp.web.form.WidgetGroupFrame = openerp.web.form.WidgetFrame.extend({
-    template: 'WidgetGroupFrame',
+openerp.web.form.WidgetGroup = openerp.web.form.WidgetFrame.extend({
+    template: 'WidgetGroup',
 }),
 
 openerp.web.form.WidgetNotebookPage = openerp.web.form.WidgetFrame.extend({
@@ -3006,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.WidgetGroupFrame',
+    'group' : 'openerp.web.form.WidgetGroup',
     '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 c7dd21f7784..4b11f31e37d 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -728,7 +728,7 @@
     </tr>
     </table>
 </t>
-<t t-name="WidgetGroupFrame">
+<t t-name="WidgetGroup">
     <t t-if="widget.string">
 	<fieldset>
 	    <legend><t t-esc="widget.string"/></legend>