summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Seinlet <nse@odoo.com>2014-07-29 12:39:51 +0200
committerNicolas Seinlet <nse@odoo.com>2014-07-29 12:39:51 +0200
commitee67d6580110b87d018b40f6ec1e59eb02c19e71 (patch)
treeec3270a87fba07b112f8dab5c922235d0ca5afcd
parent23436ca25943037a01a1ff435e05aaa32a9ffed3 (diff)
handle missing JS files with a console log
-rw-r--r--openerp/addons/base/ir/ir_qweb.py14
1 files changed, 11 insertions, 3 deletions
diff --git a/openerp/addons/base/ir/ir_qweb.py b/openerp/addons/base/ir/ir_qweb.py
index be4bfe190d9..1d487be020f 100644
--- a/openerp/addons/base/ir/ir_qweb.py
+++ b/openerp/addons/base/ir/ir_qweb.py
@@ -662,7 +662,7 @@ class DateTimeConverter(osv.AbstractModel):
if options and options.get('hide_seconds'):
pattern = pattern.replace(":ss", "").replace(":s", "")
-
+
return babel.dates.format_datetime(value, format=pattern, locale=locale)
class TextConverter(osv.AbstractModel):
@@ -771,7 +771,7 @@ class MonetaryConverter(osv.AbstractModel):
lang_code = context.get('lang') or 'en_US'
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]),
grouping=True, monetary=True)
@@ -1120,7 +1120,10 @@ class WebAsset(object):
except ValueError:
self.last_modified = datetime.datetime.strptime(attach[0]['__last_update'], server_format)
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
def content(self):
@@ -1147,6 +1150,11 @@ class JavascriptAsset(WebAsset):
else:
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):
rx_import = re.compile(r"""@import\s+('|")(?!'|"|/|https?://)""", re.U)
rx_url = re.compile(r"""url\s*\(\s*('|"|)(?!'|"|/|https?://|data:)""", re.U)