[merge] refactoring of form view widgets

bzr revid: nicolas.vanhoren@openerp.com-20120207130546-bu0m5fl99krcqbbb

1 files changed, 6 insertions, 5 deletions

diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index b8cdaf768ad..b5649e3e954 100644
--- a/addons/web_dashboard/static/src/js/dashboard.js
+++ b/addons/web_dashboard/static/src/js/dashboard.js
@@ -10,7 +10,7 @@ if (!openerp.web_dashboard) {
 openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
     init: function(view, node) {
         this._super(view, node);
-        this.template = 'DashBoard';
+        this.form_template = 'DashBoard';
         this.actions_attrs = {};
         this.action_managers = [];
     },
@@ -225,7 +225,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
             });
         }
     },
-    render: function() {
+    render_element: function() {
         // We should start with three columns available
         for (var i = this.node.children.length; i < 3; i++) {
             this.node.children.push({
@@ -234,7 +234,8 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
                 children: []
             });
         }
-        return QWeb.render(this.template, this);
+        var rendered = QWeb.render(this.form_template, this);
+        this.$element.html(rendered);
     },
     do_reload: function() {
         var view_manager = this.view.widget_parent,
@@ -244,7 +245,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
     }
 });
 openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({
-    render: function() {
+    render_element: function() {
         if (this.node.tag == 'hpaned') {
             this.node.attrs.style = '2-1';
         } else if (this.node.tag == 'vpaned') {
@@ -263,7 +264,7 @@ openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({
                 }
             }
         });
-        return this._super(this, arguments);
+        this._super(this);
     }
 });