From 033fffbf8eae46e59e3163e7cb7f70a2b4261e24 Mon Sep 17 00:00:00 2001 From: Andrew Buss Date: Sat, 16 May 2015 16:38:33 -0700 Subject: [PATCH] Refactored flashcard list --- flashcards/models.py | 2 +- flashcards/views.py | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/flashcards/models.py b/flashcards/models.py index 97543d4..836be63 100644 --- a/flashcards/models.py +++ b/flashcards/models.py @@ -158,7 +158,7 @@ class Flashcard(Model): :param user: :return: A queryset with all cards that should be visible to a user. """ - return cls.objects.filter(is_hidden=False).exclude(userflashcard__user=user, userflashcard__pulled=None) + return cls.objects.filter(is_hidden=False).exclude(flashcardhide__user=user) class UserFlashcardQuiz(Model): diff --git a/flashcards/views.py b/flashcards/views.py index 9a2e8b2..a086634 100644 --- a/flashcards/views.py +++ b/flashcards/views.py @@ -16,7 +16,6 @@ from rest_framework.status import HTTP_204_NO_CONTENT, HTTP_201_CREATED from rest_framework.response import Response from rest_framework.exceptions import AuthenticationFailed, NotAuthenticated, ValidationError, PermissionDenied from simple_email_confirmation import EmailAddress -from datetime import datetime class SectionViewSet(ReadOnlyModelViewSet): @@ -31,9 +30,7 @@ class SectionViewSet(ReadOnlyModelViewSet): Gets flashcards for a section, excluding hidden cards. Returned in strictly chronological order (material date). """ - flashcards = Flashcard.cards_visible_to(request.user).filter( \ - section=self.get_object(), is_hidden=False).all() - + flashcards = Flashcard.cards_visible_to(request.user).filter(section=self.get_object()) return Response(FlashcardSerializer(flashcards, many=True).data) @detail_route(methods=['post'], permission_classes=[IsAuthenticated]) @@ -89,7 +86,7 @@ class SectionViewSet(ReadOnlyModelViewSet): """ qs = Flashcard.objects.all() qs = qs.filter(userflashcard__user=request.user) - qs = qs.filter(section = self.get_object()) + qs = qs.filter(section=self.get_object()) serializer = FlashcardSerializer(qs, many=True) return Response(serializer.data) -- 1.9.1