From 326820d94fd4ab076e451a32e7bdeacf350e86e9 Mon Sep 17 00:00:00 2001
From: Andrey <andrey.korolev@skillbox.ru>
Date: Thu, 1 Mar 2018 16:36:32 +0300
Subject: [PATCH 1/2] Merge remote-tracking branch 'origin/fix_req' into
 fix_req

# Conflicts:
#	requirements.txt
---
 access/urls.py  | 10 ++++-----
 access/views.py | 56 ++++++++++++++++++++++++-------------------------
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/access/urls.py b/access/urls.py
index 35b1cc6..52445ff 100644
--- a/access/urls.py
+++ b/access/urls.py
@@ -18,9 +18,9 @@ urlpatterns = [
     url(r'logout/$', views.LogoutView.as_view()),
     url(r'reset/$', views.ResetPasswordView.as_view()),
     url(r'progress_detail/upload/(?P<token>[0-9A-Fa-f-]+)/$', progress.views.UploadCourseProgressUserView.as_view()),
-    url(
-        r'management/password/$',
-        views.ManagementPassword.as_view(),
-        name='management-password'
-        )
+    # url(
+    #     r'management/password/$',
+    #     views.ManagementPassword.as_view(),
+    #     name='management-password'
+    #     )
 ]
diff --git a/access/views.py b/access/views.py
index fb047a1..d84f83c 100644
--- a/access/views.py
+++ b/access/views.py
@@ -292,31 +292,31 @@ class MinUserView(APIView):
             return Response("User not found", status=404)
 
 
-class ManagementPassword(generics.GenericAPIView):
-    permission_classes = (permissions.IsAuthenticated, permissions.IsAdminUser)
-    serializer_class = UserEmailSerializer
-
-    def post(self, request):
-        """
-        Set password to the student in admin area by manager
-        ---
-        Generate new password to the student and send email with new password
-        """
-        serializer = self.get_serializer(data=request.data)
-        serializer.is_valid(raise_exception=True)
-        serializer.save()
-        logger.info(f'set password: {serializer.password} to the '
-                    f'student with email: {serializer.user.email}')
-        send_mail(
-            subject='Установлен новый пароль',
-            message=f'Ваш новый пароль {serializer.password} '
-                    f'(в последствии вы сможите сменить его в личном кабинете).',
-            from_email='robo@skillbox.ru',
-            recipient_list=[serializer.user.email],
-        )
-        logger.info(f'send email to {serializer.user.email} '
-                    f'with new password')
-        return Response(
-            data={'message': 'Письмо с новым паролем отправлено на email студента.'},
-            status=status.HTTP_201_CREATED
-        )
+# class ManagementPassword(generics.GenericAPIView):
+#     permission_classes = (permissions.IsAuthenticated, permissions.IsAdminUser)
+#     serializer_class = UserEmailSerializer
+#
+#     def post(self, request):
+#         """
+#         Set password to the student in admin area by manager
+#         ---
+#         Generate new password to the student and send email with new password
+#         """
+#         serializer = self.get_serializer(data=request.data)
+#         serializer.is_valid(raise_exception=True)
+#         serializer.save()
+#         logger.info(f'set password: {serializer.password} to the '
+#                     f'student with email: {serializer.user.email}')
+#         send_mail(
+#             subject='Установлен новый пароль',
+#             message=f'Ваш новый пароль {serializer.password} '
+#                     f'(в последствии вы сможите сменить его в личном кабинете).',
+#             from_email='robo@skillbox.ru',
+#             recipient_list=[serializer.user.email],
+#         )
+#         logger.info(f'send email to {serializer.user.email} '
+#                     f'with new password')
+#         return Response(
+#             data={'message': 'Письмо с новым паролем отправлено на email студента.'},
+#             status=status.HTTP_201_CREATED
+#         )

From 7b28e891c08001ea8956309b2dd2a2b2f58ea898 Mon Sep 17 00:00:00 2001
From: Andrey <andrey.korolev@skillbox.ru>
Date: Thu, 1 Mar 2018 16:41:30 +0300
Subject: [PATCH 2/2] Merge remote-tracking branch 'origin/fix_req' into
 fix_req

# Conflicts:
#	requirements.txt
---
 access/urls.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/access/urls.py b/access/urls.py
index 52445ff..9645616 100644
--- a/access/urls.py
+++ b/access/urls.py
@@ -23,4 +23,5 @@ urlpatterns = [
     #     views.ManagementPassword.as_view(),
     #     name='management-password'
     #     )
+
 ]