summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/coresetup.js
diff options
context:
space:
mode:
authorniv-openerp <nicolas.vanhoren@openerp.com>2013-07-11 12:34:22 +0200
committerniv-openerp <nicolas.vanhoren@openerp.com>2013-07-11 12:34:22 +0200
commita7adac1189d062ad8797b8d7ead929b27715cf3c (patch)
treecae7fdb947155a7b9fda54b8b033b5feb075ab4b /addons/web/static/src/js/coresetup.js
parent57d18c1a346464500d8176c3ef3473e31f5fd118 (diff)
Now OpenERPSession is a subclass of werkzeug's session
bzr revid: nicolas.vanhoren@openerp.com-20130711103422-w7y05ox7tq0hz0og
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
-rw-r--r--addons/web/static/src/js/coresetup.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 7d37dc2261d..81de547d0c1 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -58,7 +58,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
session_init: function () {
var self = this;
// TODO: session store in cookie should be optional
- this.session_id = this.get_cookie('session_id');
+ this.session_id = this.get_cookie('sid');
return this.session_reload().then(function(result) {
var modules = instance._modules.join(',');
var deferred = self.rpc('/web/webclient/qweblist', {mods: modules}).then(self.load_qweb.bind(self));
@@ -107,14 +107,10 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
return $.Deferred().reject();
}
_.extend(self, result);
- if (!_volatile) {
- self.set_cookie('session_id', self.session_id);
- }
return self.load_modules();
});
},
session_logout: function() {
- this.set_cookie('session_id', '');
$.bbq.removeState();
return this.rpc("/web/session/destroy", {});
},