diff --git a/web_ir_actions_act_window_message/static/src/js/web_ir_actions_act_window_message.js b/web_ir_actions_act_window_message/static/src/js/web_ir_actions_act_window_message.js index 7eb6c816..a263f6d0 100644 --- a/web_ir_actions_act_window_message/static/src/js/web_ir_actions_act_window_message.js +++ b/web_ir_actions_act_window_message/static/src/js/web_ir_actions_act_window_message.js @@ -78,30 +78,57 @@ openerp.web_ir_actions_act_window_message = function(instance) { if(_.isObject(result)) { - if (! ('views' in result) && 'view_mode' in result){ - types = result.view_mode.split(","); - if (types.length > 1){ - if (types.includes('tree') && types.includes('form')){ - if (types[0] === "tree"){ - views = [[false, "list"], [false, types[1]]]; - result.view_mode = "list" + ',' + types[1]; - } - else { - views = [[false, types[0]], [false, "list"]]; - result.view_mode = types[0] + ',' + "list"; - } - } + // clean the action as it is done in the method ``fix_view_modes`` + // in the main controller of the web module + action = result; + if ( ! ('views' in action) ){ + view_id = action.view_id || false; + if ( view_id instanceof Array ){ + view_id = view_id[0]; } - else if (result.view_mode === 'form'){ - views = [[false, "form"]]; + view_modes = action.view_mode.split(","); + if ( view_modes.length > 1 ){ + if (view_id){ + throw new Error( + _.str.sprintf(_t("Non-db action dictionaries should provide " + + "either multiple view modes or a single view " + + "mode and an optional view id."))); + } + action.views = []; + for ( i=0; i