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

Merge pull request #7647 from adityahase/fix-error-report-email

Browse source 
fix(error-report): Use error_report_email from config instead of hooks
This commit is contained in:
Saurabh 2019-06-06 10:22:34 +05:30 • committed by GitHub
commit 720dc147f3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/boot.py
View file

@ -72,7 +72,7 @@ def get_bootinfo():
bootinfo.lang = text_type(bootinfo.lang)
bootinfo.versions = {k: v['version'] for k, v in get_versions().items()}
bootinfo.error_report_email = frappe.get_hooks("error_report_email")
bootinfo.error_report_email = frappe.conf.error_report_email
bootinfo.calendars = sorted(frappe.get_hooks("calendars"))
bootinfo.treeviews = frappe.get_hooks("treeviews") or []
bootinfo.lang_dict = get_lang_dict()

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

@ -431,7 +431,7 @@ frappe.request.report_error = function(xhr, request_opts) {
}
if (exc) {
var error_report_email = (frappe.boot.error_report_email || []).join(", ");
var error_report_email = frappe.boot.error_report_email;
request_opts = frappe.request.cleanup_request_opts(request_opts);