[IMP] raise not found if bundle not found
bzr revid: fme@openerp.com-20140422144132-thk3x58eqjvjzacu
This commit is contained in:
parent
169ecc2b01
commit
bc1878e3e2
|
@ -31,7 +31,7 @@ except ImportError:
|
||||||
|
|
||||||
import openerp
|
import openerp
|
||||||
import openerp.modules.registry
|
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.tools.translate import _
|
||||||
from openerp import http
|
from openerp import http
|
||||||
|
|
||||||
|
@ -591,7 +591,10 @@ class Home(http.Controller):
|
||||||
def js_bundle(self, xmlid, **kw):
|
def js_bundle(self, xmlid, **kw):
|
||||||
# manifest backward compatible mode, to be removed
|
# manifest backward compatible mode, to be removed
|
||||||
values = {'manifest_list': manifest_list}
|
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)
|
bundle = AssetsBundle(xmlid, assets_html, debug=request.debug)
|
||||||
|
|
||||||
response = request.make_response(
|
response = request.make_response(
|
||||||
|
@ -604,7 +607,10 @@ class Home(http.Controller):
|
||||||
@http.route('/web/css/<xmlid>', type='http', auth='public')
|
@http.route('/web/css/<xmlid>', type='http', auth='public')
|
||||||
def css_bundle(self, xmlid, **kw):
|
def css_bundle(self, xmlid, **kw):
|
||||||
values = {'manifest_list': manifest_list} # manifest backward compatible mode, to be removed
|
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)
|
bundle = AssetsBundle(xmlid, assets_html, debug=request.debug)
|
||||||
|
|
||||||
response = request.make_response(
|
response = request.make_response(
|
||||||
|
|
Loading…
Reference in New Issue