projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
feb8dc0
)
[FIX] action manager dont change url for dialog
author
Antony Lesuisse
<al@openerp.com>
Thu, 16 Aug 2012 23:55:45 +0000
(
01:55
+0200)
committer
Antony Lesuisse
<al@openerp.com>
Thu, 16 Aug 2012 23:55:45 +0000
(
01:55
+0200)
bzr revid: al@openerp.com-
20120816235545
-5af63loazx25fsbg
addons/web/static/src/js/views.js
patch
|
blob
|
history
diff --git
a/addons/web/static/src/js/views.js
b/addons/web/static/src/js/views.js
index
7f2a0b1
..
0831d0c
100644
(file)
--- a/
addons/web/static/src/js/views.js
+++ b/
addons/web/static/src/js/views.js
@@
-159,7
+159,9
@@
instance.web.ActionManager = instance.web.Widget.extend({
//state = _.extend(this.inner_action.params || {}, state);
}
}
- this.getParent().do_push_state(state);
+ if(!this.dialog) {
+ this.getParent().do_push_state(state);
+ }
}
},
do_load_state: function(state, warm) {