[MERGE]Trunk.

bzr revid: vme@tinyerp.com-20140505043233-2t2e2vb1yv86hyxp

1 files changed, 12 insertions, 17 deletions

diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js
index a4bcd1922de..c64da7e5810 100644
--- a/addons/web/static/src/js/core.js
+++ b/addons/web/static/src/js/core.js
@@ -232,7 +232,7 @@ instance.web.Session.include( /** @lends instance.web.Session# */{
         var self = this;
         return this.session_reload().then(function(result) {
             var modules = instance._modules.join(',');
-            var deferred = self.rpc('/web/webclient/qweblist', {mods: modules}).then(self.load_qweb.bind(self));
+            var deferred = self.load_qweb(modules);
             if(self.session_is_valid()) {
                 return deferred.then(function() { return self.load_modules(); });
             }
@@ -318,7 +318,7 @@ instance.web.Session.include( /** @lends instance.web.Session# */{
                 loaded = $.when(
                     loaded,
                     self.rpc('/web/webclient/csslist', {mods: to_load}).done(self.load_css.bind(self)),
-                    self.rpc('/web/webclient/qweblist', {mods: to_load}).then(self.load_qweb.bind(self)),
+                    self.load_qweb(to_load),
                     self.rpc('/web/webclient/jslist', {mods: to_load}).done(function(files) {
                         file_list = file_list.concat(files);
                     })
@@ -375,14 +375,12 @@ instance.web.Session.include( /** @lends instance.web.Session# */{
         }
         return d;
     },
-    load_qweb: function(files) {
+    load_qweb: function(mods) {
         var self = this;
-        _.each(files, function(file) {
-            self.qweb_mutex.exec(function() {
-                return self.rpc('/web/proxy/load', {path: file}).then(function(xml) {
-                    if (!xml) { return; }
-                    instance.web.qweb.add_template(_.str.trim(xml));
-                });
+        self.qweb_mutex.exec(function() {
+            return self.rpc('/web/proxy/load', {path: '/web/webclient/qweb?mods=' + mods}).then(function(xml) {
+                if (!xml) { return; }
+                instance.web.qweb.add_template(_.str.trim(xml));
             });
         });
         return self.qweb_mutex.def;
@@ -460,14 +458,11 @@ instance.web.Session.include( /** @lends instance.web.Session# */{
             .appendTo(document.body)
             .load(function () {
                 try {
-                   if (options.error) {
-                         if (!this.contentDocument.body.childNodes[1]) {
-                            options.error(this.contentDocument.body.childNodes);
-                        }
-                        else {
-                            options.error(JSON.parse(this.contentDocument.body.childNodes[1].textContent));
-                        }
-                   }
+                    if (options.error) {
+                        var body = this.contentDocument.body;
+                        var node = body.childNodes[1] || body.childNodes[0];
+                        options.error(JSON.parse(node.textContent));
+                    }
                 } finally {
                     complete();
                 }