odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Inherit template.load right template. 

bzr revid: vda@tinyerp.com-20110912105325-0e7f9jmt79ztao5w
This commit is contained in:
Vaibhav (OpenERP) 2011-09-12 16:23:25 +05:30
parent fda55d90d6
commit 61e6bd9348
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web/static/src/js/views.js
View File

@ -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;

10
addons/web/static/src/xml/base.xml
View File

@ -441,11 +441,11 @@
</table>
</t>
<t t-extend="ViewManager">
<t t-jquery="table td:first-child" t-operation="prepend">
<a t-if="action" class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
href="javascript: void(0)"> </a>
</t>
<t t-extend="ViewManager" t-name="ViewManagerAction">
<t t-jquery=".view-manager-main-table .view-manager-main-content" t-operation="prepend">
<a class="oe-shortcut-toggle" title="Add / Remove Shortcut..."
href="javascript: void(0)"> </a>
</t>
</t>
<t t-name="Sidebar">