diff --git a/addons/website/static/src/js/website.js b/addons/website/static/src/js/website.js index f6185201035..84d755a4801 100644 --- a/addons/website/static/src/js/website.js +++ b/addons/website/static/src/js/website.js @@ -233,8 +233,8 @@ ---------------------------------------------------- */ var templates_def = $.Deferred().resolve(); website.add_template_file = function(template) { + var def = $.Deferred(); templates_def = templates_def.then(function() { - var def = $.Deferred(); openerp.qweb.add_template(template, function(err) { if (err) { def.reject(err); @@ -244,6 +244,7 @@ }); return def; }); + return def; }; website.add_template_file('/website/static/src/xml/website.xml'); diff --git a/addons/website_blog/static/src/js/website_blog.inline.discussion.js b/addons/website_blog/static/src/js/website_blog.inline.discussion.js index 7266c8ac97e..1210f9c93fa 100644 --- a/addons/website_blog/static/src/js/website_blog.inline.discussion.js +++ b/addons/website_blog/static/src/js/website_blog.inline.discussion.js @@ -4,9 +4,8 @@ 'use strict'; var website = openerp.website, - qweb = openerp.qweb; - // TODO: bundlify qweb templates - website.add_template_file('/website_blog/static/src/xml/website_blog.inline.discussion.xml'); + qweb = openerp.qweb; + website.blog_discussion = openerp.Class.extend({ init: function(options) { var self = this ; @@ -18,7 +17,11 @@ public_user: false, }; self.settings = $.extend({}, defaults, options); - self.do_render(self); + + // TODO: bundlify qweb templates + website.add_template_file('/website_blog/static/src/xml/website_blog.inline.discussion.xml').then(function () { + self.do_render(self); + }); }, do_render: function(data) { var self = this;