[MERGE] forward port of branch 8.0 up to d350f5b

2015-02-20 18:16:01 +01:00
parent e13923c0db d350f5b59e
commit aec02cb493
100 changed files with 400 additions and 238 deletions
@@ -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")