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

[FIX] CrashManager do not have destroy() method 

bzr revid: chs@openerp.com-20121115120331-ltujwzobh19muygl
This commit is contained in:
Christophe Simonis 2012-11-15 13:03:31 +01:00
parent 6fe34606ad
commit 6227e4b5c0
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -190,7 +190,14 @@ instance.web.Dialog = instance.web.Widget.extend({
});
instance.web.CrashManager = instance.web.Class.extend({
init: function() {
this.active = true;
},
rpc_error: function(error) {
if (!this.active) {
return;
}
if (error.data.fault_code) {
var split = ("" + error.data.fault_code).split('\n')[0].split(' -- ');
if (split.length > 1) {
@ -205,6 +212,9 @@ instance.web.CrashManager = instance.web.Class.extend({
}
},
show_warning: function(error) {
if (!this.active) {
return;
}
instance.web.dialog($('<div>' + QWeb.render('CrashManager.warning', {error: error}) + '</div>'), {
title: "OpenERP " + _.str.capitalize(error.type),
buttons: [
@ -213,7 +223,9 @@ instance.web.CrashManager = instance.web.Class.extend({
});
},
show_error: function(error) {
var self = this;
if (!this.active) {
return;
}
var buttons = {};
buttons[_t("Ok")] = function() {
$(this).dialog("close");
@ -642,7 +654,7 @@ instance.web.client_actions.add("login", "instance.web.Login");
instance.web.redirect = function(url, wait) {
// Dont display a dialog if some xmlhttprequest are in progress
if (instance.client && instance.client.crashmanager) {
instance.client.crashmanager.destroy();
instance.client.crashmanager.active = false;
}
var wait_server = function() {
@ -658,7 +670,7 @@ instance.web.redirect = function(url, wait) {
} else {
window.location = url;
}
}
};
/**
* Client action to reload the whole interface.