readme update

feature/fix_generate_pass
Andrey 8 years ago
parent 65635e247f
commit 520e44bb5c
  1. 2
      README.md
  2. 4
      access/urls.py
  3. 8
      access/views.py

@ -11,4 +11,4 @@
4 cd skill-back 4 cd skill-back
5 pip install -r requirements.txt 5 pip install -r requirements.txt
6 python manage.py test 6 python manage.py test
7 python manage.py runserver

@ -4,6 +4,8 @@ import progress.views
from access import views from access import views
urlpatterns = [ 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'teachers/$', views.TeacherListView.as_view()),
url(r'detail/(?P<out_key>[0-9A-Fa-f-]+)/$', views.DetailUserView.as_view()), url(r'detail/(?P<out_key>[0-9A-Fa-f-]+)/$', views.DetailUserView.as_view()),
url(r'detail/$', 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'logout/$', views.LogoutView.as_view()),
url(r'reset/$', views.ResetPasswordView.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/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()),
] ]

@ -158,8 +158,8 @@ class DetailUserView(APIView):
return Response(serialized_user, status=200) return Response(serialized_user, status=200)
@staticmethod @staticmethod
def get(request, pk=None): def get(request, out_key=None):
if pk is None: if out_key is None:
if request.user.is_authenticated(): if request.user.is_authenticated():
serialized_user = UserSelfSerializer(request.user).data serialized_user = UserSelfSerializer(request.user).data
serialized_user['is_i'] = True serialized_user['is_i'] = True
@ -167,10 +167,10 @@ class DetailUserView(APIView):
return Response('anonymous', status=200) return Response('anonymous', status=200)
if request.user.is_authenticated() and request.user.is_superuser \ 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: 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: except get_user_model().DoesNotExist:
return Response("User doesn't exist", status=404) return Response("User doesn't exist", status=404)

Loading…
Cancel
Save