odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP] minor changes 

bzr revid: al@openerp.com-20111216004823-s3lh80nymv2xu6fs
This commit is contained in:
Antony Lesuisse 2011-12-16 01:48:23 +01:00
parent 8721df9d54
commit a036be16c9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/web/static/src/js/chrome.js
View File

@ -1040,7 +1040,7 @@ openerp.web.WebClient = openerp.web.Widget.extend(/** @lends openerp.web.WebClie
});
},
do_reload: function() {
return $.when(this.session.session_restore(),this.menu.do_reload());
return $.when(this.session.session_init(),this.menu.do_reload());
},
do_notify: function() {
var n = this.notification;

5
addons/web/static/src/js/core.js
View File

@ -374,7 +374,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
this.shortcuts = [];
this.active_id = null;
this.ready = $.Deferred();
return this.session_restore();
return this.session_init();
},
/**
* Executes an RPC call, registering the provided callbacks.
@ -415,6 +415,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
deferred.resolve(response["result"], textStatus, jqXHR);
} else if (response.error.data.type === "session_invalid") {
self.uid = false;
// TODO deprecate or use a deferred on login.do_ask_login()
self.on_session_invalid(function() {
self.rpc(url, payload.params,
function() { deferred.resolve.apply(deferred, arguments); },
@ -525,7 +526,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
/**
* Init a session, reloads from cookie, if it exists
*/
session_restore: function () {
session_init: function () {
var self = this;
// TODO: session store in cookie should be optional
this.session_id = this.get_cookie('session_id');