Ver código fonte

[fix] add the parsed email id for the email group member (#3741)

* add the parsed email id of the email group member

* Minor fixe in the patch
version-14
Manas Solanki 8 anos atrás
committed by Makarand Bauskar
pai
commit
81133888a8
4 arquivos alterados com 26 adições e 5 exclusões
  1. +4
    -4
      frappe/email/doctype/email_group/email_group.py
  2. +2
    -1
      frappe/patches.txt
  3. +0
    -0
      frappe/patches/v8_5/__init__.py
  4. +20
    -0
      frappe/patches/v8_5/delete_email_group_member_with_invalid_emails.py

+ 4
- 4
frappe/email/doctype/email_group/email_group.py Ver arquivo

@@ -69,15 +69,15 @@ def add_subscribers(name, email_list):
count = 0
for email in email_list:
email = email.strip()
valid = validate_email_add(email, False)
parsed_email = validate_email_add(email, False)

if valid:
if parsed_email:
if not frappe.db.get_value("Email Group Member",
{"email_group": name, "email": email}):
{"email_group": name, "email": parsed_email}):
frappe.get_doc({
"doctype": "Email Group Member",
"email_group": name,
"email": email
"email": parsed_email
}).insert(ignore_permissions = frappe.flags.ignore_permissions)

count += 1


+ 2
- 1
frappe/patches.txt Ver arquivo

@@ -187,4 +187,5 @@ frappe.patches.v8_0.update_gender_and_salutation
execute:frappe.db.sql('update tabReport set module="Desk" where name="ToDo"')
frappe.patches.v8_1.enable_allow_error_traceback_in_system_settings
frappe.patches.v8_1.update_format_options_in_auto_email_report
frappe.patches.v8_1.delete_custom_docperm_if_doctype_not_exists
frappe.patches.v8_1.delete_custom_docperm_if_doctype_not_exists
frappe.patches.v8_5.delete_email_group_member_with_invalid_emails

+ 0
- 0
frappe/patches/v8_5/__init__.py Ver arquivo


+ 20
- 0
frappe/patches/v8_5/delete_email_group_member_with_invalid_emails.py Ver arquivo

@@ -0,0 +1,20 @@
# Copyright (c) 2017, Frappe and Contributors
# License: GNU General Public License v3. See license.txt

from __future__ import unicode_literals
import frappe
from frappe.utils import validate_email_add

def execute():
''' update/delete the email group member with the wrong email '''

email_group_members = frappe.get_all("Email Group Member", fields=["name", "email"])
for member in email_group_members:
validated_email = validate_email_add(member.email)
if (validated_email==member.email):
pass
else:
try:
frappe.db.set_value("Email Group Member", member.name, "email", validated_email)
except Exception:
frappe.delete_doc(doctype="Email Group Member", name=member.name, force=1, ignore_permissions=True)

Carregando…
Cancelar
Salvar