[MERGE] forward port of branch 8.0 up to d350f5b

This commit is contained in:
Christophe Simonis
2015-02-20 18:16:01 +01:00
100 changed files with 400 additions and 238 deletions
+2 -1
View File
@@ -1144,7 +1144,8 @@ instance.web.Sidebar = instance.web.Widget.extend({
self.rpc("/web/action/load", {
action_id: item.action.id,
context: c
context: new instance.web.CompoundContext(
self.dataset.get_context(), active_ids_context).eval()
}).done(function(result) {
result.context = new instance.web.CompoundContext(
result.context || {}, active_ids_context)