[MERGE] forward port branch 11.0 up to 302ad0632c

This commit is contained in:
Christophe Simonis
2018-08-24 21:12:27 +02:00
+1 -1
View File
@@ -344,7 +344,7 @@ class IrQWeb(models.AbstractModel, QWeb):
files.append({'atype': atype, 'url': href, 'filename': filename, 'content': el.text, 'media': media})
elif can_aggregate(src) and el.tag == 'script':
atype = 'text/javascript'
path = [segment for segment in href.split('/') if segment]
path = [segment for segment in src.split('/') if segment]
filename = get_resource_path(*path) if path else None
files.append({'atype': atype, 'url': src, 'filename': filename, 'content': el.text, 'media': media})
else: