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

[FIX] always show model in url 

bzr revid: al@openerp.com-20120127132438-nth4lyqq1xp55hfc
This commit is contained in:
Antony Lesuisse 2012-01-27 14:24:38 +01:00
parent 28bdd074d5
commit cb750d4121
1 changed files with 3 additions and 6 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

@ -49,10 +49,9 @@ session.web.ActionManager = session.web.OldWidget.extend({
do_push_state: function(state) {
if (this.widget_parent && this.widget_parent.do_push_state) {
if (this.inner_action) {
state['model'] = this.inner_action.res_model;
if (this.inner_action.id) {
state['action_id'] = this.inner_action.id;
} else {
state['model'] = this.inner_action.res_model;
}
}
this.widget_parent.do_push_state(state);
@ -67,8 +66,7 @@ session.web.ActionManager = session.web.OldWidget.extend({
this.null_action();
action_loaded = this.do_action(state.action_id);
}
}
else if (state.model && state.id) {
} else if (state.model && state.id) {
// TODO handle context & domain ?
this.null_action();
var action = {
@ -78,8 +76,7 @@ session.web.ActionManager = session.web.OldWidget.extend({
views: [[false, 'page'], [false, 'form']]
};
action_loaded = this.do_action(action);
}
else if (state.client_action) {
} else if (state.client_action) {
this.null_action();
this.ir_actions_client(state.client_action);
}