diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 3f35b3f44ea..8e6635c7757 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1349,7 +1349,7 @@ class Binary(openerpweb.Controller): 'id': attachment_id } except Exception,e: - args = {'erorr':e.faultCode.split('--')[1],'title':e.faultCode.split('--')[0]} + args = {'error':e.faultCode } return out % (simplejson.dumps(callback), simplejson.dumps(args)) class Action(openerpweb.Controller): diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index a71a071db3b..8ced4950bc7 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -703,6 +703,9 @@ display: block; color: #4c4c4c; text-decoration: none; + width: 200px; + text-overflow: ellipsis; + overflow: hidden; } .openerp .oe_dropdown_menu > li > a:hover { text-decoration: none; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index f634452a7ee..04d5fb07c8a 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -598,6 +598,9 @@ $sheet-padding: 16px display: block color: #4c4c4c text-decoration: none + width: 200px + text-overflow: ellipsis + overflow: hidden &:hover text-decoration: none .oe_dropdown_arrow:after diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 3703503d029..99fb754e74e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -5143,9 +5143,10 @@ instance.web.form.FieldMany2ManyBinaryMultiFiles = instance.web.form.AbstractFie // TODO : activate send on wizard and form - if (result.erorr || !result.id ) { + if (result.error || !result.id ) { - this.do_warn(result.title, result.erorr); + console.log(result.error); + this.do_warn(result.error.split('---')[0], result.error.split('---')[1]); files = _.filter(files, function (val) { return !val.upload; }); } else { diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 4e46df5ccd6..5d152db1f60 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1033,6 +1033,11 @@ instance.web.Sidebar = instance.web.Widget.extend({ this.$('.oe_form_dropdown_section').each(function() { $(this).toggle(!!$(this).find('li').length); }); + + self.$("[title]").tipsy({ + 'html': true, + 'delayIn': 500, + }) }, /** * For each item added to the section: @@ -1120,7 +1125,7 @@ instance.web.Sidebar = instance.web.Widget.extend({ var self = this; this.dataset = dataset; this.model_id = model_id; - if (args && args[0]["erorr"]) { + if (args && args[0]["error"]) { instance.web.dialog($('