summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2014-04-22 16:41:32 +0200
committerFabien Meghazi <fme@openerp.com>2014-04-22 16:41:32 +0200
commitbc1878e3e2d6bb8d76be6f02dfda0d844b5062c8 (patch)
tree06686d4034cf0ca0610a0313882a0c510aabf55e
parent169ecc2b0127ad4c1e3b16d53d6186a917d3d7ab (diff)
[IMP] raise not found if bundle not found
bzr revid: fme@openerp.com-20140422144132-thk3x58eqjvjzacu
-rw-r--r--addons/web/controllers/main.py12
1 files changed, 9 insertions, 3 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index f0248530003..51fd81a0881 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -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(