vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

[fix] catch error in data import

Browse source
This commit is contained in:
Rushabh Mehta 2017-08-24 16:05:47 +05:30
parent 4e456b4e42
commit 16129ce785
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/handler.py
View file

@ -117,6 +117,7 @@ def uploadfile():
ret = method()
except Exception:
frappe.errprint(frappe.utils.get_traceback())
frappe.response['http_status_code'] = 500
ret = None
return ret

7
frappe/public/js/frappe/request.js
View file

@ -137,8 +137,11 @@ frappe.request.call = function(opts) {
500: function(xhr) {
frappe.utils.play_sound("error");
frappe.msgprint({message:__("Server Error: Please check your server logs or contact tech support."), title:__('Something went wrong'), indicator: 'red'});
opts.error_callback && opts.error_callback();
frappe.request.report_error(xhr, opts);
try {
opts.error_callback && opts.error_callback();
} catch (e) {
frappe.request.report_error(xhr, opts);
}
},
504: function(xhr) {
frappe.msgprint(__("Request Timed Out"))