[MERGE] forward port branch 8.0 up to ee846fb

This commit is contained in:
Christophe Simonis
2016-08-19 16:27:06 +02:00
+2 -2
View File
@@ -213,7 +213,7 @@ class WebRequest(object):
to a database. to a database.
""" """
if not self.db: if not self.db:
return RuntimeError('request not bound to a database') raise RuntimeError('request not bound to a database')
return openerp.api.Environment(self.cr, self.uid, self.context) return openerp.api.Environment(self.cr, self.uid, self.context)
@lazy_property @lazy_property
@@ -249,7 +249,7 @@ class WebRequest(object):
# can not be a lazy_property because manual rollback in _call_function # can not be a lazy_property because manual rollback in _call_function
# if already set (?) # if already set (?)
if not self.db: if not self.db:
return RuntimeError('request not bound to a database') raise RuntimeError('request not bound to a database')
if not self._cr: if not self._cr:
self._cr = self.registry.cursor() self._cr = self.registry.cursor()
return self._cr return self._cr