Merge branch 'current_branch' into 'dev'

Current branch

See merge request !131
feature/fix_accout_not_found
Andrey 8 years ago
commit b0b2c6d8b2
  1. 2
      access/views.py
  2. 2
      courses/serializers.py

@ -314,6 +314,7 @@ class ManagementPassword(generics.GenericAPIView):
return Response('user not found', status=404) return Response('user not found', status=404)
user.set_password(password) user.set_password(password)
user.is_active=True
user.save() user.save()
logger.info('''set password: %s to the logger.info('''set password: %s to the
@ -326,6 +327,7 @@ class ManagementPassword(generics.GenericAPIView):
to=[user.email], to=[user.email],
bcc=[request.user.email], bcc=[request.user.email],
) )
return Response( return Response(
data={'message': 'Письмо с новым паролем отправлено на email студента.'}, data={'message': 'Письмо с новым паролем отправлено на email студента.'},
status=201 status=201

@ -8,7 +8,7 @@ class TopicSerializer(serializers.ModelSerializer):
class Meta: class Meta:
model = Topic model = Topic
exclude = ['id'] fields = '__all__'
@staticmethod @staticmethod
def get_children(self): def get_children(self):

Loading…
Cancel
Save