diff options
| author | Géry Debongnie <ged@odoo.com> | 2016-03-03 12:03:40 +0100 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2016-05-30 11:43:06 +0200 |
| commit | f3fb0bfe29bcc02715a42a5f7f4e2446a109c8e3 (patch) | |
| tree | 4e88226a8b21b456cab4a9d3e1ade62331d7902d /addons/web | |
| parent | 58245d4dcaf9ebbd61e11bfeaf37643eac542341 (diff) | |
[IMP] web_analytics: remove rpc to version_info
and put it serverside, in the session info. This saves 1 rpc for every
connections.
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/controllers/main.py | 6 | ||||
| -rw-r--r-- | addons/web/models/ir_http.py | 5 | ||||
| -rw-r--r-- | addons/web/views/webclient_templates.xml | 1 |
3 files changed, 4 insertions, 8 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 1dc945692c6..b3ce1f806ee 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -448,13 +448,7 @@ class Home(http.Controller): request.uid = request.session.uid - version_info = openerp.service.common.exp_version() - db_info = { - 'server_version': version_info.get('server_version'), - 'server_version_info': version_info.get('server_version_info'), - } context = { - 'db_info': json.dumps(db_info), 'menu_data': request.registry['ir.ui.menu'].load_menus(request.cr, request.uid, request.debug, context=request.context), 'session_info': json.dumps(request.env['ir.http'].session_info()), } diff --git a/addons/web/models/ir_http.py b/addons/web/models/ir_http.py index f3a6b1f3921..7299ba910a3 100644 --- a/addons/web/models/ir_http.py +++ b/addons/web/models/ir_http.py @@ -1,3 +1,4 @@ +import openerp from openerp import models from openerp.http import request @@ -8,12 +9,14 @@ class Http(models.Model): def session_info(self): user = request.env.user display_switch_company_menu = user.has_group('base.group_multi_company') and len(user.company_ids) > 1 + version_info = openerp.service.common.exp_version() return { "session_id": request.session_id, "uid": request.session.uid, "user_context": request.session.get_context() if request.session.uid else {}, "db": request.session.db, - "username": request.session.login, + "server_version": version_info.get('server_version'), + "server_version_info": version_info.get('server_version_info'), "name": user.name, "company_id": request.env.user.company_id.id if request.session.uid else None, "partner_id": request.env.user.partner_id.id if request.session.uid and request.env.user.partner_id else None, diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index c8adedc6f3c..a702984a4e4 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -391,7 +391,6 @@ var odoo = { session_info: <t t-raw="session_info"/>, csrf_token: "<t t-esc="request.csrf_token(None)"/>", - db_info: <t t-raw="db_info"/>, }; </script> |