pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ADD] Add support for custom arguments in View#do_execute_action

Browse Source 
bzr revid: fme@openerp.com-20111206173142-4z2ysaqf456zbcig
This commit is contained in:
Fabien Meghazi
2011-12-06 18:31:42 +01:00
parent 9796aadeb4
commit 6e33fed3b5
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/views.js
+13 -1
View File
@@ -909,7 +909,19 @@ session.web.View = session.web.Widget.extend(/** @lends session.web.View# */{
if (action_data.special) {
return handler({result: {"type":"ir.actions.act_window_close"}});
} else if (action_data.type=="object") {
return dataset.call_button(action_data.name, [[record_id], context], handler);
var args = [[record_id]], additional_args = [];
if (action_data.args) {
try {
// Warning: quotes and double quotes problem due to json and xml clash
// Maybe we should force escaping in xml or do a better parse of the args array
additional_args = JSON.parse(action_data.args.replace(/'/g, '"'));
args = args.concat(additional_args);
} catch(e) {
console.error("Could not JSON.parse arguments", action_data.args);
}
}
args.push(context);
return dataset.call_button(action_data.name, args, handler);
} else if (action_data.type=="action") {
return this.rpc('/web/action/load', { action_id: parseInt(action_data.name, 10), context: context, do_not_eval: true}, handler);
} else {