From 61e6bd93481853f6b2373fc0295852afec78dacf Mon Sep 17 00:00:00 2001 From: "Vaibhav (OpenERP)" Date: Mon, 12 Sep 2011 16:23:25 +0530 Subject: [PATCH] [FIX] Inherit template.load right template. bzr revid: vda@tinyerp.com-20110912105325-0e7f9jmt79ztao5w --- addons/web/static/src/js/views.js | 4 +++- addons/web/static/src/xml/base.xml | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index d00587840cd..6f6614e9d39 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -137,6 +137,7 @@ openerp.web.ActionManager = openerp.web.Widget.extend({ openerp.web.ViewManager = openerp.web.Widget.extend({ identifier_prefix: "viewmanager", + template: "ViewManager", init: function(parent, dataset, views) { this._super(parent); this.model = dataset.model; @@ -149,7 +150,7 @@ openerp.web.ViewManager = openerp.web.Widget.extend({ this.registry = openerp.web.views; }, render: function() { - return QWeb.render("ViewManager", {"prefix": this.element_id, views: this.views_src, 'action': this.action ? true: false}) + return QWeb.render(this.template, {"prefix": this.element_id, views: this.views_src}) }, /** * @returns {jQuery.Deferred} initial view loading promise @@ -289,6 +290,7 @@ openerp.web.ViewManager = openerp.web.Widget.extend({ }); openerp.web.ViewManagerAction = openerp.web.ViewManager.extend({ + template: "ViewManagerAction", init: function(parent, action) { this.session = parent.session; this.action = action; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5c2b2f0000d..5688ca6b0c7 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -441,11 +441,11 @@ - - - - + + + +