Commit ae9bbd26 authored by Bai's avatar Bai Committed by BaiJiangJie
Browse files

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

parent ddb71c43
dev ccrc dependabot/pip/requirements/ansible-4.2.0 feat_acl_muiltistrategy feat_pam feat_proxyterminal feat_rbac fix@dev@filter_meta jms_dev master pam pr@dev@chore_pylint pr@dev@escape_route pr@dev@feat_csp pr@dev@feat_custom_platform_auth_change pr@dev@feat_custom_watermark pr@dev@feat_ftp_log_file pr@dev@feat_rdp_chinese_username pr@dev@feat_support_sqlserver_change_password pr@dev@feat_ticket_serial pr@dev@feat_user_view pr@dev@fix_actions pr@dev@fix_dingding pr@dev@fix_sms pr@dev@fix_tcp_syslog pr@dev@k8s pr@dev@perf_base_model pr@dev@refactor_notification_event pr@dev@share_session_link pr@dev@sms_setting pr@dev@ticket pr@dev@ticket_flow_assignes pr@dev@vault_secret prr@dev@fix_ldapimport rbac refactor_asset_user_v2 remote_app repr@dev_v2.14_v2.15@2d6610b133512a3@fix_db_connection_not_close repr@v2.14_dev@da2dea50032@ticket v2.10 v2.11 v2.12 v2.13 v2.14 v2.15 v2.16 v2.17 v2.18 v2.19 v2.20 v2.21 v2.22 v2.3 v2.4 v2.5 v2.6 v2.7 v2.8 v2.9 v2.22.0 v2.21.4 v2.21.3 v2.21.2 v2.21.1 v2.21.0 v2.20.3 v2.20.2 v2.20.1 v2.20.0 v2.19.2 v2.19.1 v2.19.0 v2.18.3 v2.18.2 v2.18.1 v2.18.0 v2.17.5 v2.17.4 v2.17.3 v2.17.2 v2.17.1 v2.17.0 v2.16.3 v2.16.2 v2.16.1 v2.16.0 v2.15.5 v2.15.4 v2.15.3 v2.15.2 v2.15.1 v2.15.0 v2.14.2 v2.14.1 v2.14.0 v2.13.2 v2.13.1 v2.13.0 v2.12.2 v2.12.1 v2.12.0 v2.11.4 v2.11.3 v2.11.2 v2.11.1 v2.11.0 v2.10.5 v2.10.4 v2.10.3 v2.10.2 v2.10.1 v2.10.0 v2.9.2 v2.9.1 v2.9.0 v2.8.4 v2.8.3 v2.8.2 v2.8.1 v2.8.0 v2.7.3 v2.7.2 v2.7.1 v2.7.0 v2.6.2 v2.6.1 v2.6.0 v2.5.4 v2.5.3 v2.5.2 v2.5.1 v2.5.0 v2.4.5 v2.4.4 v2.4.3 v2.4.2 v2.4.1 v2.4.0 v2.3.3 v2.3.2 v2.3.1 v2.3.0
No related merge requests found
Showing with 1 addition and 1 deletion
+1 -1
......@@ -24,7 +24,7 @@ def send_mail_async(*args, **kwargs):
"""
if len(args) == 3:
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
args.insert(2, email_from)
args = tuple(args)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment