diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-02-07 17:47:26 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-02-07 17:47:26 +0100 |
| commit | da19a7701e151b9cf5eea74576e426f220fc6063 (patch) | |
| tree | c711e3476008a63436e8d707b3f4a291a1aa280e /addons/website/models/ir_qweb.py | |
| parent | 36d07bfc0f5b9841b17f4cfdf2ffb029ea1280e0 (diff) | |
| parent | 23752102a08ec53f576d734b733e8fba1e341533 (diff) | |
[MERGE] forward port branch saas-16 up to 23752102a08
Diffstat (limited to 'addons/website/models/ir_qweb.py')
| -rw-r--r-- | addons/website/models/ir_qweb.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/website/models/ir_qweb.py b/addons/website/models/ir_qweb.py index a20db972c0b..943a603d211 100644 --- a/addons/website/models/ir_qweb.py +++ b/addons/website/models/ir_qweb.py @@ -26,7 +26,7 @@ class QWeb(models.AbstractModel): def _get_asset(self, xmlid, options, css=True, js=True, debug=False, async=False, values=None): website = getattr(request, 'website', None) if request else None if website and website.cdn_activated: - values = dict(values, url_for=website.get_cdn_url) + values = dict(values or {}, url_for=website.get_cdn_url) return super(QWeb, self)._get_asset(xmlid, options, css, js, debug, async, values) def _website_build_attribute(self, tagName, name, value, options, values): |