summaryrefslogtreecommitdiff
path: root/addons/web_dashboard/static/src
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2012-02-08 12:11:10 +0100
committerniv-openerp <nicolas.vanhoren@openerp.com>2012-02-08 12:11:10 +0100
commit44263a42b2b9183ceeb4beba25adc79d5cd6abf9 (patch)
treec8f94d3bd67cf7d9e1ef90a8f07e4e2ae7752956 /addons/web_dashboard/static/src
parent876c61b0522b595f30ba8e5ebcf5e0bbcc499a10 (diff)
[fix] revert form refactoring branch
bzr revid: nicolas.vanhoren@openerp.com-20120208111110-p2nj0tehupxa0gmz
Diffstat (limited to 'addons/web_dashboard/static/src')
-rw-r--r--addons/web_dashboard/static/src/js/dashboard.js11
1 files changed, 5 insertions, 6 deletions
diff --git a/addons/web_dashboard/static/src/js/dashboard.js b/addons/web_dashboard/static/src/js/dashboard.js
index b5649e3e954..b8cdaf768ad 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.form_template = 'DashBoard';
+ this.template = 'DashBoard';
this.actions_attrs = {};
this.action_managers = [];
},
@@ -225,7 +225,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
});
}
},
- render_element: function() {
+ render: function() {
// We should start with three columns available
for (var i = this.node.children.length; i < 3; i++) {
this.node.children.push({
@@ -234,8 +234,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
children: []
});
}
- var rendered = QWeb.render(this.form_template, this);
- this.$element.html(rendered);
+ return QWeb.render(this.template, this);
},
do_reload: function() {
var view_manager = this.view.widget_parent,
@@ -245,7 +244,7 @@ openerp.web.form.DashBoard = openerp.web.form.Widget.extend({
}
});
openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({
- render_element: function() {
+ render: function() {
if (this.node.tag == 'hpaned') {
this.node.attrs.style = '2-1';
} else if (this.node.tag == 'vpaned') {
@@ -264,7 +263,7 @@ openerp.web.form.DashBoardLegacy = openerp.web.form.DashBoard.extend({
}
}
});
- this._super(this);
+ return this._super(this, arguments);
}
});