tzaustria
/
odoo
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for Python V3.7 (module website)

develop
Andreas Osim 2020-04-15 16:07:22 +02:00
parent aa34e93275
commit d1d2c8b61a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ext/odoo/addons/website/models/ir_qweb.py
View File

@ -3,7 +3,7 @@
import ast import ast
from odoo import models from odoo import models, tools
from odoo.http import request from odoo.http import request
@ -23,7 +23,14 @@ class QWeb(models.AbstractModel):
'img': 'src', 'img': 'src',
} }
def _get_asset(self, xmlid, options, css=True, js=True, debug=False, async_load=False, values=None): # compatibility to remove after v11 - DEPRECATED
@tools.conditional(
'xml' not in tools.config['dev_mode'],
tools.ormcache_context('xmlid', 'options.get("lang", "en_US")', 'css', 'js', 'debug', 'kw.get("async")', 'async_load', keys=("website_id",)),
)
def _get_asset(self, xmlid, options, css=True, js=True, debug=False, async_load=False, values=None, **kw):
if 'async' in kw:
async_load = kw['async']
website = getattr(request, 'website', None) if request else None website = getattr(request, 'website', None) if request else None
if website and website.cdn_activated: if website and website.cdn_activated:
values = dict(values or {}, url_for=website.get_cdn_url) values = dict(values or {}, url_for=website.get_cdn_url)