浏览代码

Return sys.exit in run-tests, allow system manager to delete bulk email

version-14
Anand Doshi 10 年前
父节点
当前提交
0b7deff77b
共有 3 个文件被更改,包括 4 次插入3 次删除
  1. +1
    -1
      frappe/commands.py
  2. +2
    -1
      frappe/email/doctype/bulk_email/bulk_email.json
  3. +1
    -1
      frappe/email/doctype/email_account/email_account.py

+ 1
- 1
frappe/commands.py 查看文件

@@ -638,7 +638,7 @@ def run_tests(context, app=None, module=None, doctype=None, test=(), driver=None
pass pass
# sel.close() # sel.close()


return ret
sys.exit(ret)


@click.command('serve') @click.command('serve')
@click.option('--port', default=8000) @click.option('--port', default=8000)


+ 2
- 1
frappe/email/doctype/bulk_email/bulk_email.json 查看文件

@@ -64,13 +64,14 @@
"icon": "icon-envelope", "icon": "icon-envelope",
"idx": 1, "idx": 1,
"in_create": 1, "in_create": 1,
"modified": "2015-03-19 05:36:16.813340",
"modified": "2015-03-31 15:10:57.553836",
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Email", "module": "Email",
"name": "Bulk Email", "name": "Bulk Email",
"owner": "Administrator", "owner": "Administrator",
"permissions": [ "permissions": [
{ {
"delete": 1,
"email": 1, "email": 1,
"permlevel": 0, "permlevel": 0,
"print": 1, "print": 1,


+ 1
- 1
frappe/email/doctype/email_account/email_account.py 查看文件

@@ -252,7 +252,7 @@ def notify_unreplied():
"unread_notification_sent": 0, "unread_notification_sent": 0,
"creation": ("<", datetime.now() - timedelta(seconds = (email_account.unreplied_for_mins or 30) * 60)), "creation": ("<", datetime.now() - timedelta(seconds = (email_account.unreplied_for_mins or 30) * 60)),
"creation": (">", datetime.now() - timedelta(seconds = (email_account.unreplied_for_mins or 30) * 60 * 3)) "creation": (">", datetime.now() - timedelta(seconds = (email_account.unreplied_for_mins or 30) * 60 * 3))
}, debug=True):
}):
comm = frappe.get_doc("Communication", comm.name) comm = frappe.get_doc("Communication", comm.name)


if frappe.db.get_value(comm.reference_doctype, comm.reference_name, "status")=="Open": if frappe.db.get_value(comm.reference_doctype, comm.reference_name, "status")=="Open":


正在加载...
取消
保存