summaryrefslogtreecommitdiff
path: root/addons/web/controllers/main.py
diff options
context:
space:
mode:
authorDenis Ledoux <dle@odoo.com>2015-02-20 16:43:15 +0100
committerDenis Ledoux <dle@odoo.com>2015-02-20 16:43:15 +0100
commitb0be8dfdfd78c7953c1f60bf86b862bc46abd65c (patch)
tree809f773fb0e15134bbf7aa491de566f1136e6ee2 /addons/web/controllers/main.py
parenta9ba27b79f563088f84667d5d1b405e5e87a369b (diff)
parentaae75f1e297cb6b370bac7341f54f310923fe5dc (diff)
[MERGE] forward port of branch saas-3 up to aae75f1
Diffstat (limited to 'addons/web/controllers/main.py')
-rw-r--r--addons/web/controllers/main.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 563d6a85084..c652e678a34 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1240,7 +1240,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']
@@ -1250,7 +1250,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")