pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[MERGE] forward port branch saas-6 up to 787a32b

Browse Source
This commit is contained in:
Christophe Simonis
2016-08-19 16:35:22 +02:00
parent ef1386a7d2 787a32bdaf
commit 58cbcbae31
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/http.py
+2 -2
View File
@@ -210,7 +210,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
@@ -246,7 +246,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