From 90de23129e94593020fa45b4ff7913489b94e000 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Mon, 27 Apr 2020 15:33:08 +0200 Subject: [PATCH 1/3] fix: socketio default port to fix #10119 Signed-off-by: mathieu.brunot --- frappe/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 907a7b6113..4ec9550820 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -65,7 +65,7 @@ frappe.ready_events.push(fn); } window.dev_server = {{ dev_server }}; - window.socketio_port = {{ frappe.socketio_port }}; + window.socketio_port = {{ (frappe.socketio_port or (3000 if dev_server else 80)) }}; From 9b6f0a2e4c261e9256e8eda1ecc2b2b4d556a0f6 Mon Sep 17 00:00:00 2001 From: "Chinmay D. Pai" Date: Fri, 8 May 2020 20:18:08 +0530 Subject: [PATCH 2/3] fix: use doctype instead of service name to send email Signed-off-by: Chinmay D. Pai --- frappe/integrations/offsite_backup_utils.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/frappe/integrations/offsite_backup_utils.py b/frappe/integrations/offsite_backup_utils.py index c280a1d9dd..7e80cb68c4 100644 --- a/frappe/integrations/offsite_backup_utils.py +++ b/frappe/integrations/offsite_backup_utils.py @@ -10,7 +10,7 @@ from frappe.utils import split_emails, get_backups_path def send_email(success, service_name, doctype, email_field, error_status=None): - recipients = get_recipients(service_name, email_field) + recipients = get_recipients(doctype, email_field) if not recipients: frappe.log_error("No Email Recipient found for {0}".format(service_name), "{0}: Failed to send backup status email".format(service_name)) @@ -36,11 +36,11 @@ def send_email(success, service_name, doctype, email_field, error_status=None): frappe.sendmail(recipients=recipients, subject=subject, message=message) -def get_recipients(service_name, email_field): +def get_recipients(doctype, email_field): if not frappe.db: frappe.connect() - return split_emails(frappe.db.get_value(service_name, None, email_field)) + return split_emails(frappe.db.get_value(doctype, None, email_field)) def get_latest_backup_file(with_files=False): From cf200c195eeb2d15fc90c1ee156705cf594fd015 Mon Sep 17 00:00:00 2001 From: "mathieu.brunot" Date: Fri, 8 May 2020 20:43:52 +0200 Subject: [PATCH 3/3] socketio_port default to null Signed-off-by: mathieu.brunot --- frappe/templates/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/templates/base.html b/frappe/templates/base.html index 4ec9550820..dd5dd63a1f 100644 --- a/frappe/templates/base.html +++ b/frappe/templates/base.html @@ -65,7 +65,7 @@ frappe.ready_events.push(fn); } window.dev_server = {{ dev_server }}; - window.socketio_port = {{ (frappe.socketio_port or (3000 if dev_server else 80)) }}; + window.socketio_port = {{ (frappe.socketio_port or 'null') }};