110swag / flashy-backend

Download as
Browse Code ยป

Commit 6967144326d93157f3a1033ed33d1f2e4e41383e

Authored by Rohan Rangray
2 parents 2c00c7d077 693e1afa5e
Exists in master

Merge branch 'master' of git.ucsd.edu:110swag/flashy-backend 

mergin' conflicts

Showing 2 changed files Side-by-side Diff

flashcards/api.py View file @ 6967144
... ... @@ -49,7 +49,6 @@
49 49 if not request.user: return False
50 50 if not request.user.is_authenticated(): return False
51 51 if request.user.confirmed_email: return True
52   - if (now() - request.user.date_joined).days > 0:
53   - raise PermissionDenied('Please verify your email before continuing')
54   - return True
  52 + if (now() - request.user.date_joined).days < 1: return True
  53 + raise PermissionDenied('Please verify your email before continuing')
flashcards/views.py View file @ 6967144
... ... @@ -402,7 +402,7 @@
402 402 user_flashcard_quiz.save()
403 403  
404 404 response = QuizResponseSerializer(instance=user_flashcard_quiz, mask=mask)
405   - log_event(request, response)
  405 + log_event(request, response.data)
406 406 return Response(response.data, status=HTTP_200_OK)
407 407  
408 408 def partial_update(self, request, *args, **kwargs):