diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-11-29 10:10:38 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-11-29 10:10:38 +0100 |
| commit | e00cb36f41ced6e3ccadd9d0bac0e1ab88e21fc3 (patch) | |
| tree | a2ce5fe45cdf3eee86b7e2ad561dd379b5b2dee9 /addons/web/static/src/js/coresetup.js | |
| parent | 8431c69016ef24980ff5f01a0f6e388399514d8c (diff) | |
| parent | 4b464deeeebe61094a289cbd56cf3d780c295847 (diff) | |
[MERGE] from trunk
bzr revid: xmo@openerp.com-20121129091038-0fexjx8o12drjbga
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index 7ddefa301f2..fa1348a5f8c 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -119,6 +119,9 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess }, session_logout: function() { this.set_cookie('session_id', ''); + var url = "#"; + $.bbq.pushState(url); + window.location.search = ""; return this.rpc("/web/session/destroy", {}); }, get_cookie: function (name) { @@ -543,12 +546,12 @@ instance.web._lt = function (s) { return {toString: function () { return instance.web._t(s); }} }; instance.web.qweb = new QWeb2.Engine(); -instance.web.qweb.default_dict['__debug__'] = instance.session.debug; // Which one ? instance.web.qweb.debug = instance.session.debug; instance.web.qweb.default_dict = { '_' : _, '_t' : instance.web._t, 'JSON': JSON, + '__debug__': instance.session.debug, }; instance.web.qweb.preprocess_node = function() { // Note that 'this' is the Qweb Node |