diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-02-20 18:16:01 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-02-20 18:16:01 +0100 |
| commit | aec02cb4935103aa7d158b56397c191932b35fa7 (patch) | |
| tree | 82915059f96448510e6b1c5183611175c483e579 /addons/web/controllers | |
| parent | e13923c0db1fd4ba9c98eacdcd987c6be7575a5f (diff) | |
| parent | d350f5b59e8905a76e965b6f34a0db14dbb53af0 (diff) | |
[MERGE] forward port of branch 8.0 up to d350f5b
Diffstat (limited to 'addons/web/controllers')
| -rw-r--r-- | addons/web/controllers/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 2ed235c979e..7bea7f50111 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1255,7 +1255,7 @@ class Action(http.Controller): except Exception: action_id = 0 # force failed read - base_action = Actions.read([action_id], ['name', 'type'], request.context) + base_action = Actions.read([action_id], ['type'], request.context) if base_action: ctx = request.context action_type = base_action[0]['type'] @@ -1265,7 +1265,7 @@ class Action(http.Controller): ctx.update(additional_context) action = request.session.model(action_type).read([action_id], False, ctx) if action: - value = clean_action(dict(action[0], **base_action[0])) + value = clean_action(action[0]) return value @http.route('/web/action/run', type='json', auth="user") |