diff options
| author | Christophe Simonis <chs@openerp.com> | 2012-11-28 14:56:44 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@openerp.com> | 2012-11-28 14:56:44 +0100 |
| commit | 79b2e72f07fc5843f682650ba16ea8dbb62b0713 (patch) | |
| tree | 1614e442bb57823535dcb7bfb9ea38e97f33942b /addons/web/static/src/js/coresetup.js | |
| parent | e7b2ec50fe8b719d6fae13737e8c34e54eb520ab (diff) | |
| parent | 2b7559316818906733d0437c05d47cd8c74b2459 (diff) | |
merge upstream
bzr revid: chs@openerp.com-20121123165044-n5l5nqtm678abb2s
bzr revid: chs@openerp.com-20121128135644-iuiynfijiue67uth
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 a740827c1b5..5ca44c1d80b 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -125,6 +125,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) { @@ -549,12 +552,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 |