Merge branch 'dev' into 'master'

fix

See merge request !130

access/serializers.py

@@ -102,28 +102,3 @@ class UserSearchSerializer(serializers.ModelSerializer):
     @staticmethod
     def get_last_request(self):
         return self.useractivity.last_request
-
-
-class UserEmailSerializer(serializers.Serializer):
-    """
-    Serializer for set new password to the student in admin area by manager.
-    """
-    email = serializers.EmailField()
-
-    def __init__(self, *args, **kwargs):
-        super(UserEmailSerializer, self).__init__(*args, **kwargs)
-        self.user = None
-        self.password = None
-
-    def validate_email(self, email):
-        self.user = get_object_or_404(get_user_model(), email=email)
-        if not self.user.is_active:
-            raise serializers.ValidationError(
-                'Учетная запись еще не активирована. '
-                'Пользователь должен сначала подтвердить свой email.')
-        return email
-
-    def save(self):
-        self.password = get_user_model().objects.make_random_password()
-        self.user.set_password(self.password)
-        self.user.save()

access/views.py

@@ -16,8 +16,7 @@ from rest_framework.views import APIView
 from rest_framework import permissions, generics, status
 
 from access.models.other import Invite, ResetPassword, Account
-from access.serializers import (UserSelfSerializer, UserSearchSerializer,
+from access.serializers import (UserSelfSerializer, UserSearchSerializer)
-                                UserEmailSerializer)
 from lms.tools import decode_base64