[FIX] HTML editor error reporting

bzr revid: ddm@openerp.com-20140122142537-as7tyryit0ft0p35

diff --git a/addons/website/static/src/js/website.ace.js b/addons/website/static/src/js/website.ace.js
index fba8be0..6433330 100644 (file)
--- a/addons/website/static/src/js/website.ace.js
+++ b/addons/website/static/src/js/website.ace.js
@@ -260,7 +260,9 @@
             $.when.apply($, requests).then(function () {
                 self.reloadPage.call(self);
             }).fail(function (source, error) {
             $.when.apply($, requests).then(function () {
                 self.reloadPage.call(self);
             }).fail(function (source, error) {

-                var message = (error.data.arguments[0] === "Access Denied") ? "Access denied: please sign in" : error.message;
+                var message = _.isString(error) ? error
+                    : (error.data.arguments[0] === "Access Denied") ? "Access denied: please sign in"
+                    : error.message;

                 self.displayError.call(self, message);
             });
         },
                 self.displayError.call(self, message);
             });
         },

@@ -273,7 +275,7 @@
                     args: [[session.id], { 'arch':  xml.xml }, website.get_context()],
                 });
             } else {
                     args: [[session.id], { 'arch':  xml.xml }, website.get_context()],
                 });
             } else {

-                return $.Deferred().fail("Malformed XML document");
+                return $.Deferred().reject(null, "Malformed XML document");

             }
         },
         updateHash: function () {
             }
         },
         updateHash: function () {