[FIX] HTML editor error reporting

bzr revid: ddm@openerp.com-20140122142537-as7tyryit0ft0p35
2014-01-22 15:25:37 +01:00
parent 92f06e7eab
commit 3ddf62ac83
1 changed files with 4 additions and 2 deletions
@@ -260,7 +260,9 @@
            $.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);
            });
        },
@@ -273,7 +275,7 @@
                    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 () {