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

Merge pull request #9881 from jumpserver/pr@dev@perf_email_test_error 

perf: 邮箱测试时，不填写'主题前缀'会报错
pull/9883/head
老广 2023-03-08 14:02:37 +08:00 committed by GitHub
parent bb30fcd7fd 72ca55c293
commit c1d1863af4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/settings/api/email.py
View File

@ -42,7 +42,7 @@ class MailTestingAPI(APIView):
# if k.startswith('EMAIL'): # if k.startswith('EMAIL'):
# setattr(settings, k, v) # setattr(settings, k, v)
try: try:
subject = settings.EMAIL_SUBJECT_PREFIX + "Test" subject = settings.EMAIL_SUBJECT_PREFIX or '' + "Test"
message = "Test smtp setting" message = "Test smtp setting"
email_from = email_from or email_host_user email_from = email_from or email_host_user
email_recipient = email_recipient or email_from email_recipient = email_recipient or email_from