浏览代码

Merge pull request #1127 from nabinhait/develop

removed duplicate download backup link
version-14
Nabin Hait 10 年前
父节点
当前提交
68cdb9de74
共有 2 个文件被更改,包括 1 次插入10 次删除
  1. +0
    -9
      frappe/config/setup.py
  2. +1
    -1
      frappe/email/bulk.py

+ 0
- 9
frappe/config/setup.py 查看文件

@@ -208,15 +208,6 @@ def get_data():
"description": _("Install Applications."),
"icon": "icon-download"
},
{
"type": "doctype",
"name": "Backup Manager",
"label": _("Download Backup"),
"onclick": "frappe.ui.toolbar.download_backup",
"icon": "icon-download-alt",
"description": _("Send download link of a recent backup to System Managers"),
"hide_count": True
},
{
"type": "doctype",
"name": "Backup Manager",


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

@@ -165,7 +165,7 @@ def unsubscribe(doctype, name, email):
return_unsubscribed_page(email, doctype, name)

def return_unsubscribed_page(email, doctype, name):
frappe.respond_as_web_page(_("Unsubscribed"), _("{0} has has left the conversation in {1} {2}").format(email, _(doctype), name))
frappe.respond_as_web_page(_("Unsubscribed"), _("{0} has left the conversation in {1} {2}").format(email, _(doctype), name))

def flush(from_test=False):
"""flush email queue, every time: called from scheduler"""


正在加载...
取消
保存