[MERGE] forward port of branch 7.0 up to 0bbd835

This commit is contained in:
Denis Ledoux 2015-02-23 11:47:25 +01:00
commit 56c73bf6f3
1 changed files with 3 additions and 2 deletions

View File

@ -1255,10 +1255,11 @@ instance.web.Sidebar = instance.web.Widget.extend({
instance.web.dialog($("<div />").text(_t("You must choose at least one record.")), { title: _t("Warning"), modal: true });
return false;
}
var dataset = self.getParent().dataset;
var active_ids_context = {
active_id: ids[0],
active_ids: ids,
active_model: self.getParent().dataset.model,
active_model: dataset.model,
};
$.when(domain).done(function (domain) {
@ -1272,7 +1273,7 @@ instance.web.Sidebar = instance.web.Widget.extend({
self.rpc("/web/action/load", {
action_id: item.action.id,
context: new instance.web.CompoundContext(
self.dataset.get_context(), active_ids_context).eval()
dataset.get_context(), active_ids_context).eval()
}).done(function(result) {
result.context = new instance.web.CompoundContext(
result.context || {}, active_ids_context)