diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index ad5dd21d0d8..e36b46ed51a 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1617,8 +1617,8 @@ class Binary(openerpweb.Controller): 'filename': ufile.filename, 'id': attachment_id } - except Exception, e: - args = { 'error': e.message } + except Exception,e: + args = {'erorr':e.faultCode.split('--')[1],'title':e.faultCode.split('--')[0]} return out % (simplejson.dumps(callback), simplejson.dumps(args)) class Action(openerpweb.Controller): diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 81662ac6487..ddedcdd2ff6 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -978,11 +978,7 @@ instance.web.Sidebar = instance.web.Widget.extend({ this.fileupload_id = _.uniqueId('oe_fileupload'); $(window).on(this.fileupload_id, function() { var args = [].slice.call(arguments).slice(1); - if (args[0] && args[0].error) { - alert(args[0].error); - } else { - self.do_attachement_update(self.dataset, self.model_id); - } + self.do_attachement_update(self.dataset, self.model_id,args); instance.web.unblockUI(); }); }, @@ -1092,9 +1088,21 @@ instance.web.Sidebar = instance.web.Widget.extend({ }); }); }, - do_attachement_update: function(dataset, model_id) { + do_attachement_update: function(dataset, model_id,args) { + var self = this; this.dataset = dataset; this.model_id = model_id; + if (args && args[0]["erorr"]) { + instance.web.dialog($('