summaryrefslogtreecommitdiff
path: root/addons/web/controllers
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-03-19 18:48:41 +0100
committerChristophe Simonis <chs@odoo.com>2015-03-19 18:48:41 +0100
commit3baab9b22d3e6a15bc773e865dc761840df0ddad (patch)
tree0d1bab13b137fa88c351d2daddbcd6787593b02f /addons/web/controllers
parentd5da26a5a6dc4d3a82a6a69c50dc468e7c35f6ce (diff)
parent7780004f95203fb9f86273eea9ea81a261277a52 (diff)
[MERGE] forward port of branch 8.0 up to 7780004
Diffstat (limited to 'addons/web/controllers')
-rw-r--r--addons/web/controllers/main.py14
1 files changed, 0 insertions, 14 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 7bea7f50111..2603d877c24 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -941,20 +941,6 @@ class DataSet(http.Controller):
return self._call_kw(model, method, args, {})
def _call_kw(self, model, method, args, kwargs):
- # Temporary implements future display_name special field for model#read()
- if method in ('read', 'search_read') and kwargs.get('context', {}).get('future_display_name'):
- if 'display_name' in args[1]:
- if method == 'read':
- names = dict(request.session.model(model).name_get(args[0], **kwargs))
- else:
- names = dict(request.session.model(model).name_search('', args[0], **kwargs))
- args[1].remove('display_name')
- records = getattr(request.session.model(model), method)(*args, **kwargs)
- for record in records:
- record['display_name'] = \
- names.get(record['id']) or "{0}#{1}".format(model, (record['id']))
- return records
-
if method.startswith('_'):
raise AccessError(_("Underscore prefixed methods cannot be remotely called"))