From 3a793019b66dc5e246f19151003fbd70d02c98d3 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 26 Jul 2012 02:42:27 +0200 Subject: [PATCH] [FIX] client action urls bzr revid: al@openerp.com-20120726004227-w9vqt8jv6gtn7l9p --- addons/web/static/src/js/chrome.js | 1 + addons/web/static/src/js/views.js | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index b5c69f5c82f..7d012b8764f 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1057,6 +1057,7 @@ instance.web.WebClient = instance.web.Client.extend({ }, do_push_state: function(state) { this.set_title(state.title); + delete state.title; var url = '#' + $.param(state); this._current_state = _.clone(state); $.bbq.pushState(url); diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index ddf4050fa38..d1040937a41 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -120,7 +120,9 @@ instance.web.ActionManager = instance.web.Widget.extend({ if (this.getParent() && this.getParent().do_push_state) { if (this.inner_action) { state['title'] = this.inner_action.name; - state['model'] = this.inner_action.res_model; + if(this.inner_action.type == 'ir.actions.act_window') { + state['model'] = this.inner_action.res_model; + } if (this.inner_action.id) { state['action_id'] = this.inner_action.id; } @@ -223,7 +225,7 @@ instance.web.ActionManager = instance.web.Widget.extend({ // These buttons will be overwrited by