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

[IMP] raise not found if bundle not found 

bzr revid: fme@openerp.com-20140422144132-thk3x58eqjvjzacu
This commit is contained in:
Fabien Meghazi 2014-04-22 16:41:32 +02:00
parent 169ecc2b01
commit bc1878e3e2
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/web/controllers/main.py
View File

@ -31,7 +31,7 @@ except ImportError:
import openerp
import openerp.modules.registry
from openerp.addons.base.ir.ir_qweb import AssetsBundle
from openerp.addons.base.ir.ir_qweb import AssetsBundle, QWebTemplateNotFound
from openerp.tools.translate import _
from openerp import http
@ -591,7 +591,10 @@ class Home(http.Controller):
def js_bundle(self, xmlid, **kw):
# manifest backward compatible mode, to be removed
values = {'manifest_list': manifest_list}
assets_html = request.render(xmlid, lazy=False, qcontext=values)
try:
assets_html = request.render(xmlid, lazy=False, qcontext=values)
except QWebTemplateNotFound:
return request.not_found()
bundle = AssetsBundle(xmlid, assets_html, debug=request.debug)
response = request.make_response(
@ -604,7 +607,10 @@ class Home(http.Controller):
@http.route('/web/css/<xmlid>', type='http', auth='public')
def css_bundle(self, xmlid, **kw):
values = {'manifest_list': manifest_list} # manifest backward compatible mode, to be removed
assets_html = request.render(xmlid, lazy=False, qcontext=values)
try:
assets_html = request.render(xmlid, lazy=False, qcontext=values)
except QWebTemplateNotFound:
return request.not_found()
bundle = AssetsBundle(xmlid, assets_html, debug=request.debug)
response = request.make_response(