[FIX] edi, calendar webclient bootstrap
bzr revid: fme@openerp.com-20140501210507-cbl9no3o92zkdq5h
This commit is contained in:
parent
db48dbef3e
commit
a22d0ce78a
|
@ -39,8 +39,9 @@ class meeting_invitation(http.Controller):
|
|||
|
||||
if attendee:
|
||||
attendee_data['current_attendee'] = attendee[0]
|
||||
js = "\n ".join('<script type="text/javascript" src="%s"></script>' % i for i in webmain.manifest_list('js', db=db))
|
||||
css = "\n ".join('<link rel="stylesheet" href="%s">' % i for i in webmain.manifest_list('css', db=db))
|
||||
|
||||
css = '<link rel="stylesheet" href="/web/css/web.assets_backend"/>'
|
||||
js = '<script type="text/javascript" src="/web/js/web.assets_backend"></script>'
|
||||
|
||||
return webmain.html_template % {
|
||||
'js': js,
|
||||
|
|
|
@ -13,8 +13,8 @@ class EDI(openerp.http.Controller):
|
|||
modules = webmain.module_boot(req) + ['edi']
|
||||
modules_str = ','.join(modules)
|
||||
modules_json = simplejson.dumps(modules)
|
||||
js = "\n ".join('<script type="text/javascript" src="%s"></script>' % i for i in webmain.manifest_list(req, modules_str, 'js'))
|
||||
css = "\n ".join('<link rel="stylesheet" href="%s">' % i for i in webmain.manifest_list(req, modules_str, 'css'))
|
||||
css = '<link rel="stylesheet" href="/web/css/web.assets_backend"/>'
|
||||
js = '<script type="text/javascript" src="/web/js/web.assets_backend"></script>'
|
||||
|
||||
# `url` may contain a full URL with a valid query string, we basically want to watch out for XML brackets and double-quotes
|
||||
safe_url = werkzeug.url_quote_plus(url,':/?&;=')
|
||||
|
|
Loading…
Reference in New Issue