github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(common) 修复管理员未设置Email主题前缀导致发送邮件失败的问题

v2.1
Bai 2020-09-02 09:57:28 +08:00 committed by BaiJiangJie
parent 8f0cd12a3c
commit a52b8a13fd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/common/tasks.py
View File

@ -24,7 +24,7 @@ def send_mail_async(*args, **kwargs):
""" """
if len(args) == 3: if len(args) == 3:
args = list(args) args = list(args)
args[0] = settings.EMAIL_SUBJECT_PREFIX + args[0] args[0] = (settings.EMAIL_SUBJECT_PREFIX or '') + args[0]
email_from = settings.EMAIL_FROM or settings.EMAIL_HOST_USER email_from = settings.EMAIL_FROM or settings.EMAIL_HOST_USER
args.insert(2, email_from) args.insert(2, email_from)
args = tuple(args) args = tuple(args)