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

[MERGE] client_action from url] 

bzr revid: al@openerp.com-20120614184657-1vpdyyns78iiskhg
This commit is contained in:
Antony Lesuisse 2012-06-14 20:46:57 +02:00
parent db054a47d8 d8a5c516fa
commit 100aa232b1
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -77,7 +77,14 @@ instance.web.ActionManager = instance.web.Widget.extend({
});
} else if (state.client_action) {
this.null_action();
this.ir_actions_client(state.client_action);
var action = state.client_action;
if(_.isString(action)) {
action = {
tag: action,
params: state,
};
}
this.ir_actions_client(action);
}
$.when(action_loaded || null).then(function() {