diff --git a/addons/hr_recruitment/views/hr_recruitment_views.xml b/addons/hr_recruitment/views/hr_recruitment_views.xml index 20748105c5c..270264a98c8 100644 --- a/addons/hr_recruitment/views/hr_recruitment_views.xml +++ b/addons/hr_recruitment/views/hr_recruitment_views.xml @@ -810,7 +810,7 @@ - + diff --git a/addons/web_editor/static/src/js/widgets.js b/addons/web_editor/static/src/js/widgets.js index 2ed5965636a..25b2385222f 100644 --- a/addons/web_editor/static/src/js/widgets.js +++ b/addons/web_editor/static/src/js/widgets.js @@ -389,7 +389,7 @@ var ImageDialog = Widget.extend({ $form.find('.well > span').remove(); $form.find('.well > div').show(); _.each(attachments, function (record) { - record.src = record.url || '/web/image/' + record.id; + record.src = record.url || _.str.sprintf('/web/image/%s/%s', record.id, encodeURI(record.name)); // Name is added for SEO purposes record.is_document = !(/gif|jpe|jpg|png/.test(record.mimetype)); }); if (error || !attachments.length) { @@ -446,7 +446,7 @@ var ImageDialog = Widget.extend({ return (r.url || r.id); }); _.each(this.records, function (record) { - record.src = record.url || '/web/image/' + record.id; + record.src = record.url || _.str.sprintf('/web/image/%s/%s', record.id, encodeURI(record.name)); // Name is added for SEO purposes record.is_document = !(/gif|jpe|jpg|png/.test(record.mimetype)); }); this.display_attachments(); diff --git a/odoo/addons/base/ir/ir_qweb/qweb.py b/odoo/addons/base/ir/ir_qweb/qweb.py index 725fb1b0e40..1670dfa1e51 100644 --- a/odoo/addons/base/ir/ir_qweb/qweb.py +++ b/odoo/addons/base/ir/ir_qweb/qweb.py @@ -5,6 +5,7 @@ from lxml import etree, html import re import traceback from itertools import count +from psycopg2.extensions import TransactionRollbackError from textwrap import dedent import werkzeug from werkzeug.utils import escape as _escape @@ -315,7 +316,7 @@ class QWeb(object): values = dict(self.default_values(), **values) try: return compiled(self, append, values, options, log) - except QWebException, e: + except (QWebException, TransactionRollbackError) as e: raise e except Exception, e: path = log['last_path_node']