summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorVishmita <vja@tinyerp.com>2012-06-21 14:34:25 +0530
committerVishmita <vja@tinyerp.com>2012-06-21 14:34:25 +0530
commit26dc7e2fa936dd1692a6d9fe767cde520695042b (patch)
tree039c1288f6d3270b406ff99907849502b73c3518 /addons/web/static/src
parent87afddd90785c86306bd7dfd1522bf8e8b5e2f47 (diff)
[FIX]Minor changes.
bzr revid: vja@tinyerp.com-20120621090425-wa3lrw5tait9lt9s
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/chrome.js10
-rw-r--r--addons/web/static/src/js/coresetup.js13
2 files changed, 13 insertions, 10 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 475f0b4d16e..1b318ae13de 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -392,13 +392,13 @@ instance.web.DatabaseManager = instance.web.Widget.extend({
success: function () {
self.do_notify(_t("Backed"), _t("Database backed up successfully"));
},
- error: function(){
- if (instance.webclient.crashmanager.on_rpc_error) {
- self.display_error({
+ error: function(error){
+ if(error){
+ self.display_error({
title: 'Backup Database',
error: 'AccessDenied'
- });
- }
+ });
+ }
},
complete: function() {
self.unblockUI();
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js
index 8e7b5d4f75d..b8924d81680 100644
--- a/addons/web/static/src/js/coresetup.js
+++ b/addons/web/static/src/js/coresetup.js
@@ -332,11 +332,14 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
.appendTo(document.body)
.load(function () {
try {
- if (options.error) {
- options.error(JSON.parse(
- this.contentDocument.body.childNodes[1].textContent
- ));
- }
+ if (options.error) {
+ if (!this.contentDocument.body.childNodes[1]) {
+ options.error(this.contentDocument.body.childNodes);
+ }
+ else {
+ options.error(JSON.parse(this.contentDocument.body.childNodes[1].textContent));
+ }
+ }
} finally {
complete();
}