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

[fix] Email Alert: "nowdate" in eval's context

Browse source
This commit is contained in:
Anand Doshi 2014-09-01 12:52:26 +05:30
parent 26fad43f0b
commit 72eb38a03c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
frappe/core/doctype/email_alert/email_alert.py
View file

@ -60,8 +60,11 @@ def trigger_email_alerts(doc, method=None):
def evaluate_alert(doc, alert, event):
if isinstance(alert, basestring):
alert = frappe.get_doc("Email Alert", alert)
context = {"doc": doc, "nowdate": nowdate}
if alert.condition:
if not eval(alert.condition, {"doc": doc}):
if not eval(alert.condition, context):
return
if event=="Value Change" and not doc.is_new():
@ -72,7 +75,7 @@ def evaluate_alert(doc, alert, event):
for recipient in alert.email_alert_recipients:
recipients = []
if recipient.condition:
if not eval(recipient.condition, {"doc": doc}):
if not eval(recipient.condition, context):
continue
if recipient.email_by_document_field:
if validate_email_add(doc.get(recipient.email_by_document_field)):