Skip to content

[8.0][FIX] ActWindow from Python Method after Popup #846

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
moylop260 merged 2 commits into from
Feb 6, 2018
Merged

[8.0][FIX] ActWindow from Python Method after Popup #846

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8be5bf
[FIX] ActWindow from Python Method after Popup
Maartincm Jan 23, 2018
6bcaf9a
[MOD] Action Cleaning as in fix_view_modes
Maartincm Jan 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 51 additions & 1 deletion web_ir_actions_act_window_message/static/src/js/web_ir_actions_act_window_message.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,57 @@ openerp.web_ir_actions_act_window_message = function(instance)
{
if(_.isObject(result))
{
self.do_action(result);
// 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];
}
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<view_modes.length; i++ )
action.views.push([false, view_modes[i]]);
}
else
action.views = [[view_id, view_modes[0]]];
}

view_type = action.view_type || 'form';
if ( view_type != 'form' ){
self.do_action(action);
}
else if ( 'view_mode' in action ){
view_modes = action.view_mode.split(",");
new_view_mode = [];
for ( i=0; i<view_modes.length; i++ ){
if ( view_modes[i] === "tree" )
new_view_mode.push("list");
else
new_view_mode.push(view_modes[i]);
}
action.view_mode = new_view_mode.join(",");
}

views = action.views;
new_views = [];
for ( i=0; i<views.length; i++ ){
if ( views[i][1] === "tree" )
new_views.push([views[i][0], "list"]);
else
new_views.push(views[i]);
}
action.views = new_views;

self.do_action(action);
}
else
{
Expand Down