From 694fe1fb3ff87a5f811c6aa0f388cfa4946b113d Mon Sep 17 00:00:00 2001 From: Olivier Dony Date: Wed, 18 Mar 2015 12:16:24 +0100 Subject: [PATCH] [FIX] web: remove deprecated hack for future_display_name This temporary patch was used to simulate the presence of a `display_name` field in all models. It is not needed anymore as of version 8.0, which comes with the actual magic to make `display_name` work everywhere. --- addons/web/controllers/main.py | 14 -------------- addons/web/static/src/js/view_form.js | 2 +- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index c652e678a34..9819e5b895b 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -921,20 +921,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 Exception("Access Denied: Underscore prefixed methods cannot be remotely called") diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index 06462a9077d..df86223c57c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -292,7 +292,7 @@ instance.web.FormView = instance.web.View.extend(instance.web.form.FieldManagerM var fields = _.keys(self.fields_view.fields); fields.push('display_name'); return self.dataset.read_index(fields, { - context: { 'bin_size': true, 'future_display_name' : true } + context: { 'bin_size': true } }).then(function(r) { self.trigger('load_record', r); });