pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] reload: can wait server is available

Browse Source 
bzr revid: chs@openerp.com-20121030113750-4y039gx7cunwz859
This commit is contained in:
Christophe Simonis
2012-10-30 12:37:50 +01:00
parent da27fd32e0
commit f986227f8f
1 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/chrome.js
+38 -13
View File
@@ -615,22 +615,47 @@ instance.web.client_actions.add("login", "instance.web.Login");
/**
* Client action to reload the whole interface.
* If params has an entry 'menu_id', it opens the given menu entry.
* If params has an entry 'wait', reload will wait the openerp server to be reachable before reloading
*/
instance.web.Reload = function(parent, params) {
var menu_id = (params && params.menu_id) || false;
var l = window.location;
var sobj = $.deparam(l.search.substr(1));
sobj.ts = new Date().getTime();
var search = '?' + $.param(sobj);
var hash = l.hash;
if (menu_id) {
hash = "#menu_id=" + menu_id;
// hide errors
if (instance.client && instance.client.crashmanager) {
instance.client.crashmanager.destroy();
}
var url = l.protocol + "//" + l.host + l.pathname + search + hash;
window.onerror = function() {};
window.location = url;
var reload = function() {
console.log('relocate');
var menu_id = (params && params.menu_id) || false;
var l = window.location;
var sobj = $.deparam(l.search.substr(1));
sobj.ts = new Date().getTime();
var search = '?' + $.param(sobj);
var hash = l.hash;
if (menu_id) {
hash = "#menu_id=" + menu_id;
}
var url = l.protocol + "//" + l.host + l.pathname + search + hash;
window.location = url;
};
var wait_server = function() {
parent.session.rpc("/web/webclient/version_info", {})
.done(function() {
reload();
})
.fail(function() {
setTimeout(wait_server, 250);
});
};
if (parent && params && params.wait) {
setTimeout(wait_server, 1000);
} else {
reload();
}
};
instance.web.client_actions.add("reload", "instance.web.Reload");