From 35d7bc2d3eb3d467f5f61eb4c938a6725a669a09 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Thu, 2 Feb 2017 18:11:56 +0530 Subject: [PATCH] [minor] remove references from email, leads to conversation for all messages --- frappe/email/doctype/email_account/email_account.py | 6 ------ frappe/email/email_body.py | 1 - frappe/public/build.json | 7 ++----- 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/frappe/email/doctype/email_account/email_account.py b/frappe/email/doctype/email_account/email_account.py index 65f06f374a..e94d085944 100755 --- a/frappe/email/doctype/email_account/email_account.py +++ b/frappe/email/doctype/email_account/email_account.py @@ -361,12 +361,6 @@ class EmailAccount(Document): communication.reference_doctype = parent.doctype communication.reference_name = parent.name - # check if message is notification and disable notifications for this message - references = email.mail.get("References") - if references: - if "notification" in references: - communication.unread_notification_sent = 1 - def set_sender_field_and_subject_field(self): '''Identify the sender and subject fields from the `append_to` DocType''' # set subject_field and sender_field diff --git a/frappe/email/email_body.py b/frappe/email/email_body.py index 0d5524b7fa..ca5c82863a 100755 --- a/frappe/email/email_body.py +++ b/frappe/email/email_body.py @@ -188,7 +188,6 @@ class EMail: self.msg_root["Message-Id"] = '<' + message_id + '>' else: self.msg_root["Message-Id"] = get_message_id() - self.msg_root["References"] = '' def set_in_reply_to(self, in_reply_to): """Used to send the Message-Id of a received email back as In-Reply-To""" diff --git a/frappe/public/build.json b/frappe/public/build.json index ecddea6e32..1177f2f0da 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -23,10 +23,8 @@ "public/js/frappe/misc/rating_icons.html" ], "js/editor.min.js": [ - "public/js/lib/jquery/jquery.hotkeys.js", - "public/js/lib/beautify-html.js", - "public/js/frappe/ui/editor.html", - "public/js/frappe/ui/editor.js" + "public/js/lib/summernote/summernote.js", + "public/js/lib/summernote/summernote.css" ], "js/dialog.min.js": [ "public/js/frappe/dom.js", @@ -233,7 +231,6 @@ "public/js/frappe/list/list_item_subject.html", "public/js/frappe/list/list_permission_footer.html", "public/js/frappe/list/listview.js", - "public/js/frappe/views/calendar_base.js", "public/js/frappe/views/calendar.js", "public/js/frappe/list/blueimp-gallery.html", "public/js/frappe/list/image_view_item_row.html",