From 75ec77193e1f80f316f41477338307e42fcd6478 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Mon, 9 Apr 2018 12:43:11 +0530 Subject: [PATCH 1/3] Removed administrator from the email list of cc, bcc (#5416) --- frappe/core/doctype/communication/email.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/frappe/core/doctype/communication/email.py b/frappe/core/doctype/communication/email.py index 8121e13788..8babfa79da 100755 --- a/frappe/core/doctype/communication/email.py +++ b/frappe/core/doctype/communication/email.py @@ -233,15 +233,20 @@ def get_recipients_cc_and_bcc(doc, recipients, cc, bcc, fetched_from_email_accou # don't cc to people who already received the mail from sender's email service cc = list(set(cc) - set(original_cc) - set(original_recipients)) + remove_administrator_from_email_list(cc) original_bcc = split_emails(doc.bcc) bcc = list(set(bcc) - set(original_bcc) - set(original_recipients)) + remove_administrator_from_email_list(bcc) - if 'Administrator' in recipients: - recipients.remove('Administrator') + remove_administrator_from_email_list(recipients) return recipients, cc, bcc +def remove_administrator_from_email_list(email_list): + if 'Administrator' in email_list: + email_list.remove('Administrator') + def prepare_to_notify(doc, print_html=None, print_format=None, attachments=None): """Prepare to make multipart MIME Email From fbf66336fbcdae7dfd6516c31b83bccf8e63108f Mon Sep 17 00:00:00 2001 From: Saurabh Date: Mon, 9 Apr 2018 15:18:55 +0530 Subject: [PATCH 2/3] [hotfix][urgent] fix backup compression (#5418) --- frappe/utils/backups.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frappe/utils/backups.py b/frappe/utils/backups.py index f0729d672d..7254ba7fd4 100644 --- a/frappe/utils/backups.py +++ b/frappe/utils/backups.py @@ -65,7 +65,7 @@ class BackupGenerator: site = site.replace('.', '_') #Generate a random name using today's date and a 8 digit random number - for_db = todays_date + "-" + site + "-database.sql.gz" + for_db = todays_date + "-" + site + "-database.sql" for_public_files = todays_date + "-" + site + "-files.tar" for_private_files = todays_date + "-" + site + "-private-files.tar" backup_path = get_backup_path() @@ -119,6 +119,8 @@ class BackupGenerator: cmd_string = 'gzip %(backup_path_db)s '% args err, out = frappe.utils.execute_in_shell(cmd_string) + self.backup_path_db = "{0}.gz".format(self.backup_path_db) + def send_email(self): """ Sends the link to backup file located at erpnext/backups From 8c3a209323b8cf74a0af492e71f560b34afe39ab Mon Sep 17 00:00:00 2001 From: Nabin Hait Date: Mon, 9 Apr 2018 15:51:28 +0600 Subject: [PATCH 3/3] bumped to version 10.1.20 --- frappe/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index a6ae69330f..6dae826e54 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json from .exceptions import * from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template -__version__ = '10.1.19' +__version__ = '10.1.20' __title__ = "Frappe Framework" local = Local()