vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor: use composite unique index in Email Account (#28417)

Browse source
This commit is contained in:
s-aga-r 2024-11-11 12:19:38 +05:30 • committed by GitHub
parent 0e3233d592
commit c62e7334bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/email/doctype/email_account/email_account.json
View file

@ -95,8 +95,7 @@
"in_list_view": 1, "in_list_view": 1,
"label": "Email Address", "label": "Email Address",
"options": "Email", "options": "Email",
"reqd": 1, "reqd": 1
"unique": 1
}, },
{ {
"default": "0", "default": "0",
@ -697,7 +696,7 @@
"icon": "fa fa-inbox", "icon": "fa fa-inbox",
"index_web_pages_for_search": 1, "index_web_pages_for_search": 1,
"links": [], "links": [],
"modified": "2024-07-18 11:05:57.193762", "modified": "2024-11-11 10:12:06.667888",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Email", "module": "Email",
"name": "Email Account", "name": "Email Account",

8
frappe/email/doctype/email_account/email_account.py
View file

@ -1034,3 +1034,11 @@ def set_email_password(email_account, password):
return False return False
return True return True
def on_doctype_update() -> None:
frappe.db.add_unique(
"Email Account",
["email_id", "enable_incoming", "enable_outgoing"],
constraint_name="unique_email_account_type",
)

4
frappe/email/receive.py
View file

@ -432,7 +432,9 @@ class Email:
_from_email = self.decode_email(self.mail.get("X-Original-From") or self.mail["From"]) _from_email = self.decode_email(self.mail.get("X-Original-From") or self.mail["From"])
_reply_to = self.decode_email(self.mail.get("Reply-To")) _reply_to = self.decode_email(self.mail.get("Reply-To"))
if _reply_to and not frappe.db.get_value("Email Account", {"email_id": _reply_to}, "email_id"): if _reply_to and not frappe.db.get_value(
"Email Account", {"email_id": _reply_to, "enable_incoming": 1}, "email_id"
):
self.from_email = extract_email_id(_reply_to) self.from_email = extract_email_id(_reply_to)
else: else:
self.from_email = extract_email_id(_from_email) self.from_email = extract_email_id(_from_email)