odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

handle missing JS files with a console log

This commit is contained in:
Nicolas Seinlet 2014-07-29 12:39:51 +02:00
parent 23436ca259
commit ee67d65801
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
openerp/addons/base/ir/ir_qweb.py
View File

@ -662,7 +662,7 @@ class DateTimeConverter(osv.AbstractModel):
if options and options.get('hide_seconds'): if options and options.get('hide_seconds'):
pattern = pattern.replace(":ss", "").replace(":s", "") pattern = pattern.replace(":ss", "").replace(":s", "")
return babel.dates.format_datetime(value, format=pattern, locale=locale) return babel.dates.format_datetime(value, format=pattern, locale=locale)
class TextConverter(osv.AbstractModel): class TextConverter(osv.AbstractModel):
@ -771,7 +771,7 @@ class MonetaryConverter(osv.AbstractModel):
lang_code = context.get('lang') or 'en_US' lang_code = context.get('lang') or 'en_US'
lang = self.pool['res.lang'] lang = self.pool['res.lang']
formatted_amount = lang.format(cr, uid, [lang_code], formatted_amount = lang.format(cr, uid, [lang_code],
fmt, Currency.round(cr, uid, display, record[field_name]), fmt, Currency.round(cr, uid, display, record[field_name]),
grouping=True, monetary=True) grouping=True, monetary=True)
@ -1120,7 +1120,10 @@ class WebAsset(object):
except ValueError: except ValueError:
self.last_modified = datetime.datetime.strptime(attach[0]['__last_update'], server_format) self.last_modified = datetime.datetime.strptime(attach[0]['__last_update'], server_format)
except Exception: except Exception:
raise KeyError("Could not find asset '%s' for '%s' addon" % (self.url, module)) self._missingAsset(module)
def _missingAsset(self, module):
raise KeyError("Could not find asset '%s' for '%s' addon" % (self.url, module))
@openerp.tools.func.lazy_property @openerp.tools.func.lazy_property
def content(self): def content(self):
@ -1147,6 +1150,11 @@ class JavascriptAsset(WebAsset):
else: else:
return '<script type="text/javascript" charset="utf-8">%s</script>' % self.source return '<script type="text/javascript" charset="utf-8">%s</script>' % self.source
def _missingAsset(self, module):
self.source="console.log('Missing JS source : %s')" % self.url
self.url = None
self.last_modified = datetime.datetime.now()
class StylesheetAsset(WebAsset): class StylesheetAsset(WebAsset):
rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U) rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U)
rx_url = re.compile(r"""url\s*\(\s*('|"|)(?!'|"|/|https?://|data:)""", re.U) rx_url = re.compile(r"""url\s*\(\s*('|"|)(?!'|"|/|https?://|data:)""", re.U)