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

[FIX] url handling 

bzr revid: al@openerp.com-20111213142608-bgbo5wkuf5xqbrvq
This commit is contained in:
Antony Lesuisse 2011-12-13 15:26:08 +01:00
parent 0c1021806d
commit 99808af722
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,7 @@ session.web.ActionManager = session.web.Widget.extend({
this.content_stop();
},
ir_actions_act_window: function (action, on_close) {
var self = this;
if (_(['base.module.upgrade', 'base.setup.installer'])
.contains(action.res_model)) {
var old_close = on_close;
@ -125,12 +126,13 @@ session.web.ActionManager = session.web.Widget.extend({
} else {
this.dialog_stop();
this.content_stop();
this.inner_action = action;
this.inner_viewmanager = new session.web.ViewManagerAction(this, action);
this.inner_viewmanager.do_push_state.add(this.do_push_state);
this.inner_viewmanager.do_push_state.add(function(state,overwrite) {
state['action_id'] = action.id;
self.do_push_state(state,true);
});
this.inner_viewmanager.appendTo(this.$element);
if (action.id) {
this.do_push_state({action_id: action.id}, true);
}
}
},
ir_actions_act_window_close: function (action, on_closed) {