Переглянути джерело

refactor(minor): email.make API

* Avoid double save if possible - seemed like it was added mistakenly,
  didnt find enough evidence for it's addition
* Avoid json.loads breaking if "" was passed for attachments
version-14
Gavin D'souza 3 роки тому
джерело
коміт
487ff091c8
1 змінених файлів з 3 додано та 6 видалено
  1. +3
    -6
      frappe/core/doctype/communication/email.py

+ 3
- 6
frappe/core/doctype/communication/email.py Переглянути файл

@@ -76,16 +76,13 @@ def make(doctype=None, name=None, content=None, subject=None, sent_or_received =
"message_id":get_message_id().strip(" <>"), "message_id":get_message_id().strip(" <>"),
"read_receipt":read_receipt, "read_receipt":read_receipt,
"has_attachment": 1 if attachments else 0, "has_attachment": 1 if attachments else 0,
"communication_type": communication_type
"communication_type": communication_type,
}).insert(ignore_permissions=True) }).insert(ignore_permissions=True)


comm.save(ignore_permissions=True)

if isinstance(attachments, str):
attachments = json.loads(attachments)

# if not committed, delayed task doesn't find the communication # if not committed, delayed task doesn't find the communication
if attachments: if attachments:
if isinstance(attachments, str):
attachments = json.loads(attachments)
add_attachments(comm.name, attachments) add_attachments(comm.name, attachments)


if cint(send_email): if cint(send_email):


Завантаження…
Відмінити
Зберегти