Merge branch 'current_branch' into 'dev'

fix

See merge request !137
feature/fix_accout_not_found
Andrey 8 years ago
commit 243ea74bab
  1. 3
      access/models/user.py
  2. 4
      access/views.py

@ -80,9 +80,10 @@ class CustomUserManager(BaseUserManager):
"bcc": [settings.SUPPORT_EMAIL],
}
EmailMessage(
msg = EmailMessage(
**body
)
msg.send()
return user
def create_user(self, email, **extra_fields):

@ -319,7 +319,7 @@ class ManagementPassword(generics.GenericAPIView):
logger.info('''set password: %s to the
student with email: %s''' % (password, user.email))
EmailMessage(
msg = EmailMessage(
subject='Установлен новый пароль',
body='''Ваш новый пароль %s
(в последствии вы сможите сменить его в личном кабинете).''' % password,
@ -328,6 +328,8 @@ class ManagementPassword(generics.GenericAPIView):
bcc=[request.user.email],
)
msg.send()
return Response(
data={'message': 'Письмо с новым паролем отправлено на email студента.'},
status=201

Loading…
Cancel
Save