[MERGE] forward port of branch saas-3 up to aae75f1

This commit is contained in:
Denis Ledoux
2015-02-20 16:43:15 +01:00
6 changed files with 73 additions and 7 deletions
+2 -1
View File
@@ -1288,7 +1288,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)