summaryrefslogtreecommitdiff
path: root/addons/web/controllers/main.py
diff options
context:
space:
mode:
authorToufik Benjaa <tbe@odoo.com>2018-03-20 16:36:26 +0100
committerToufik Benjaa <tbe@odoo.com>2018-06-27 16:39:45 +0200
commit29c00a56daa377e40f4d28e86a10f105617fd243 (patch)
tree6c89ee53a4e1729a754b4df96bb6d60fd89cb5e8 /addons/web/controllers/main.py
parentc1b6cfaab8d42885533e23985058cfc78b48d7c7 (diff)
[IMP] http: Sessions implicit deactivation
- Store a token inside sessions to allow implicit session deactivation when needed. backport of @da1f153d61d747d9357694382fe04f96c0ca886a @c8243e71c6da37547a19f61c58f25d5d03e13d38
Diffstat (limited to 'addons/web/controllers/main.py')
-rw-r--r--addons/web/controllers/main.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index a1ead7e5d1a..158ae695268 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -37,6 +37,7 @@ from openerp.tools.misc import str2bool, xlwt
from openerp import http
from openerp.http import request, serialize_exception as _serialize_exception, content_disposition
from openerp.exceptions import AccessError, UserError
+from openerp.service.report import exp_report, exp_report_get
_logger = logging.getLogger(__name__)
@@ -1479,7 +1480,6 @@ class Reports(http.Controller):
def index(self, action, token):
action = json.loads(action)
- report_srv = request.session.proxy("report")
context = dict(request.context)
context.update(action["context"])
@@ -1492,15 +1492,11 @@ class Reports(http.Controller):
report_ids = action['datas'].pop('ids')
report_data.update(action['datas'])
- report_id = report_srv.report(
- request.session.db, request.session.uid, request.session.password,
- action["report_name"], report_ids,
- report_data, context)
+ report_id = exp_report(request.session.db, request.session.uid, action["report_name"], report_ids, report_data, context)
report_struct = None
while True:
- report_struct = report_srv.report_get(
- request.session.db, request.session.uid, request.session.password, report_id)
+ report_struct = exp_report_get(request.session.db, request.session.uid, report_id)
if report_struct["state"]:
break