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

Merge pull request #2817 from manassolanki/news

Browse source 
Newsletter Doctype Naming
This commit is contained in:
Nabin Hait 2017-03-07 15:26:47 +05:30 • committed by GitHub
commit cd07ddd97e
3 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,6 @@
{
"allow_copy": 0,
"allow_guest_to_view": 0,
"allow_import": 0,
"allow_rename": 1,
"autoname": "",
@ -390,19 +391,19 @@
"unique": 0
}
],
"has_web_view": 0,
"hide_heading": 0,
"hide_toolbar": 0,
"icon": "fa fa-envelope",
"idx": 1,
"image_view": 0,
"in_create": 0,
"in_dialog": 0,
"is_submittable": 0,
"issingle": 0,
"istable": 0,
"max_attachments": 3,
"menu_index": 0,
"modified": "2017-02-28 18:42:52.346905",
"modified": "2017-03-07 12:59:18.173824",
"modified_by": "Administrator",
"module": "Email",
"name": "Newsletter",

3
frappe/email/doctype/newsletter/newsletter.py
View file

@ -17,9 +17,6 @@ from frappe.utils.file_manager import get_file
class Newsletter(Document):
def autoname(self):
self.name = self.subject
def onload(self):
if self.email_sent:
self.get("__onload").status_count = dict(frappe.db.sql("""select status, count(name)

13
frappe/email/doctype/newsletter/test_newsletter.py
View file

@ -21,7 +21,7 @@ class TestNewsletter(unittest.TestCase):
}).insert()
def test_send(self):
self.send_newsletter()
name = self.send_newsletter()
email_queue_list = [frappe.get_doc('Email Queue', e.name) for e in frappe.get_all("Email Queue")]
self.assertEquals(len(email_queue_list), 3)
@ -31,14 +31,14 @@ class TestNewsletter(unittest.TestCase):
def test_unsubscribe(self):
# test unsubscribe
self.send_newsletter()
name = self.send_newsletter()
from frappe.email.queue import flush
flush(from_test=True)
to_unsubscribe = unquote(frappe.local.flags.signed_query_string.split("email=")[1].split("&")[0])
confirmed_unsubscribe(to_unsubscribe, "_Test Newsletter")
confirmed_unsubscribe(to_unsubscribe, name)
self.send_newsletter()
name = self.send_newsletter()
email_queue_list = [frappe.get_doc('Email Queue', e.name) for e in frappe.get_all("Email Queue")]
self.assertEquals(len(email_queue_list), 2)
@ -50,16 +50,17 @@ class TestNewsletter(unittest.TestCase):
def send_newsletter(self):
frappe.db.sql("delete from `tabEmail Queue`")
frappe.db.sql("delete from `tabEmail Queue Recipient`")
frappe.delete_doc("Newsletter", "_Test Newsletter")
frappe.db.sql("delete from `tabNewsletter`")
newsletter = frappe.get_doc({
"doctype": "Newsletter",
"subject": "_Test Newsletter",
"send_from": "Test Sender <test_sender@example.com>",
"message": "Testing my news.",
"message": "Testing my news."
}).insert(ignore_permissions=True)
newsletter.append("email_group", {"email_group": "_Test Email Group"})
newsletter.save()
newsletter.send_emails()
return newsletter.name
test_dependencies = ["Email Group"]