From 520e44bb5c2dfee840c25922685b091025b66cdf Mon Sep 17 00:00:00 2001
From: Andrey <andrey.korolev@skillbox.ru>
Date: Sun, 18 Feb 2018 13:02:00 +0300
Subject: [PATCH] readme update

---
 README.md       | 2 +-
 access/urls.py  | 4 ++--
 access/views.py | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index c392986..0b4e369 100644
--- a/README.md
+++ b/README.md
@@ -11,4 +11,4 @@
 4 cd skill-back
 5 pip install -r requirements.txt
 6 python manage.py test
-
+7 python manage.py runserver
diff --git a/access/urls.py b/access/urls.py
index 4e8aef6..75ef29a 100644
--- a/access/urls.py
+++ b/access/urls.py
@@ -4,6 +4,8 @@ import progress.views
 from access import views
 
 urlpatterns = [
+    url(r'progress_detail/(?P<token>[0-9A-Fa-f-]+)/$', progress.views.CourseProgressUserView.as_view()),
+    url(r'progress_dynamic/(?P<token>[0-9A-Fa-f-]+)/$', progress.views.CourseProgressDynamicView.as_view()),
     url(r'teachers/$', views.TeacherListView.as_view()),
     url(r'detail/(?P<out_key>[0-9A-Fa-f-]+)/$', views.DetailUserView.as_view()),
     url(r'detail/$', views.DetailUserView.as_view()),
@@ -16,6 +18,4 @@ 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'progress_detail/(?P<token>[0-9A-Fa-f-]+)/$', progress.views.CourseProgressUserView.as_view()),
-    url(r'progress_dynamic/(?P<token>[0-9A-Fa-f-]+)/$', progress.views.CourseProgressDynamicView.as_view()),
 ]
\ No newline at end of file
diff --git a/access/views.py b/access/views.py
index d3c8a87..cfcaed5 100644
--- a/access/views.py
+++ b/access/views.py
@@ -158,8 +158,8 @@ class DetailUserView(APIView):
         return Response(serialized_user, status=200)
 
     @staticmethod
-    def get(request, pk=None):
-        if pk is None:
+    def get(request, out_key=None):
+        if out_key is None:
             if request.user.is_authenticated():
                 serialized_user = UserSelfSerializer(request.user).data
                 serialized_user['is_i'] = True
@@ -167,10 +167,10 @@ class DetailUserView(APIView):
             return Response('anonymous', status=200)
 
         if request.user.is_authenticated() and request.user.is_superuser \
-                or request.user.is_staff or request.user.out_key == pk:
+                or request.user.is_staff or request.user.out_key == out_key:
 
             try:
-                user = get_user_model().objects.get(out_key=pk)
+                user = get_user_model().objects.get(out_key=out_key)
             except get_user_model().DoesNotExist:
                 return Response("User doesn't exist", status=404)