diff --git a/flashcards/models.py b/flashcards/models.py index a01ec31..d00f8b3 100644 --- a/flashcards/models.py +++ b/flashcards/models.py @@ -1,5 +1,3 @@ -from datetime import datetime - from django.contrib.auth.models import AbstractUser, UserManager from django.core.exceptions import PermissionDenied from django.db.models import * @@ -127,9 +125,9 @@ class Flashcard(Model): :param user: :return: Whether the card is hidden from the user. """ - result = user.userflashcard_set.filter(flashcard=self) - if not result.exists(): return self.is_hidden - return result[0].is_hidden() + if self.userflashcard_set.filter(user=user).exists(): return False + if self.is_hidden or self.flashcardhide_set.filter(user=user).exists(): return True + return False def edit(self, user, new_flashcard): """