Преглед изворни кода

Merge pull request #2997 from mbauskar/email-account-fixes

[minor] minor fixes in email_account and added has_attachment in comm…
version-14
Nabin Hait пре 8 година
committed by GitHub
родитељ
комит
92b63f29e1
2 измењених фајлова са 8 додато и 1 уклоњено
  1. +2
    -1
      frappe/core/doctype/communication/communication_list.js
  2. +6
    -0
      frappe/email/doctype/email_account/email_account.py

+ 2
- 1
frappe/core/doctype/communication/communication_list.js Прегледај датотеку

@@ -2,7 +2,8 @@ frappe.listview_settings['Communication'] = {
add_fields: [ add_fields: [
"sent_or_received","recipients", "subject", "sent_or_received","recipients", "subject",
"communication_medium", "communication_type", "communication_medium", "communication_type",
"sender", "seen", "reference_doctype", "reference_name"
"sender", "seen", "reference_doctype", "reference_name",
"has_attachment"
], ],


filters: [["status", "=", "Open"]], filters: [["status", "=", "Open"]],


+ 6
- 0
frappe/email/doctype/email_account/email_account.py Прегледај датотеку

@@ -247,6 +247,9 @@ class EmailAccount(Document):
email_sync_rule = self.build_email_sync_rule() email_sync_rule = self.build_email_sync_rule()


email_server = self.get_incoming_server(in_receive=True, email_sync_rule=email_sync_rule) email_server = self.get_incoming_server(in_receive=True, email_sync_rule=email_sync_rule)
if not email_server:
return

emails = email_server.get_messages() emails = email_server.get_messages()


incoming_mails = emails.get("latest_messages") incoming_mails = emails.get("latest_messages")
@@ -595,6 +598,9 @@ class EmailAccount(Document):
uid_list = { flag.get("uid", None): flag.get("action", "Read") for flag in flags } uid_list = { flag.get("uid", None): flag.get("action", "Read") for flag in flags }
if flags and uid_list: if flags and uid_list:
email_server = self.get_incoming_server() email_server = self.get_incoming_server()
if not email_server:
return

email_server.update_flag(uid_list=uid_list) email_server.update_flag(uid_list=uid_list)


# mark communication as read # mark communication as read


Loading…
Откажи
Сачувај