odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[REV] Revert Rev.1290: Breaks more than it fixes 

bzr revid: fme@openerp.com-20111018151534-3w5ms47i8yj48gpq
This commit is contained in:
Fabien Meghazi 2011-10-18 17:15:34 +02:00
parent 437c6346fc
commit 29f2f28afe
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
addons/web/static/src/js/views.js
View File

@ -854,19 +854,15 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
return self.widget_parent.on_action_executed.apply(null, arguments);
}
};
var context = new db.web.CompoundContext(dataset.get_context());
if (record_id) {
context.add({
active_id: record_id,
active_ids: [record_id],
active_model: dataset.model
});
}
var handler = function (r) {
var action = r.result;
if (action && action.constructor == Object) {
return self.rpc('/web/session/eval_domain_and_context', {
contexts: [context, action.context || {}],
contexts: [dataset.get_context(), action.context || {}, {
active_id: record_id || false,
active_ids: [record_id || false],
active_model: dataset.model
}],
domains: []
}).pipe(function (results) {
if (!action_data.context) {
@ -882,6 +878,8 @@ db.web.View = db.web.Widget.extend(/** @lends db.web.View# */{
}
};
var context = new db.web.CompoundContext(dataset.get_context(), action_data.context || {});
if (action_data.special) {
return handler({result: {"type":"ir.actions.act_window_close"}});
} else if (action_data.type=="object") {