From a222348da766d93d98186160c037a00a003a3043 Mon Sep 17 00:00:00 2001 From: Andrew Buss Date: Thu, 21 May 2015 14:09:27 -0700 Subject: [PATCH] let a user see his own cards --- flashcards/models.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/flashcards/models.py b/flashcards/models.py index 8a2996f..23255de 100644 --- a/flashcards/models.py +++ b/flashcards/models.py @@ -1,6 +1,5 @@ from math import log1p from math import exp -import datetime from django.contrib.auth.models import AbstractUser, UserManager from django.contrib.auth.tokens import default_token_generator @@ -15,6 +14,10 @@ from simple_email_confirmation import SimpleEmailConfirmationUserMixin from fields import MaskField from cached_property import cached_property +from datetime import datetime + + + @@ -255,7 +258,7 @@ class Flashcard(Model): @cached_property def score(self): def seconds_since_epoch(dt): - epoch = make_aware(datetime.datetime.utcfromtimestamp(0)) + epoch = make_aware(datetime.utcfromtimestamp(0)) delta = dt - epoch return delta.total_seconds() @@ -274,8 +277,8 @@ class Flashcard(Model): :param user: :return: A queryset with all cards that should be visible to a user. """ - return cls.objects.filter(author__confirmed_email=True).filter(is_hidden=False).exclude( - flashcardhide__user=user) + return cls.objects.filter(Q(author__confirmed_email=True) | Q(author=user) + ).exclude(Q(is_hidden=True) | Q(flashcardhide__user=user)) class UserFlashcardQuiz(Model): -- 1.9.1