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

Merge pull request #20 from shadowzey/master 

捕获添加用户邮箱填写错误时邮件发送失败的异常
pull/23/head
蓝枫 2015-10-13 16:55:13 +08:00
parent 949065be2c 0667067c0c
commit e284584506
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
juser/views.py
View File

@ -663,8 +663,11 @@ def user_add(request):
except Exception:
pass
else:
send_mail(mail_title, mail_msg, MAIL_FROM, [email], fail_silently=False)
msg = u'添加用户 %s 成功！ 用户密码已发送到 %s 邮箱！' % (username, email)
try:
send_mail(mail_title, mail_msg, MAIL_FROM, [email], fail_silently=False)
msg = u'添加用户 %s 成功！ 用户密码已发送到 %s 邮箱！' % (username, email)
except:
msg = u'添加用户 %s 成功！ 用户密码发送失败，请检查邮箱是否正确！' % username
return render_to_response('juser/user_add.html', locals(), context_instance=RequestContext(request))