diff --git a/flashcards/migrations/0004_auto_20150506_1443.py b/flashcards/migrations/0004_auto_20150506_1443.py new file mode 100644 index 0000000..af59615 --- /dev/null +++ b/flashcards/migrations/0004_auto_20150506_1443.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('flashcards', '0003_auto_20150504_1600'), + ] + + operations = [ + migrations.AlterField( + model_name='userflashcard', + name='mask', + field=models.ForeignKey(blank=True, to='flashcards.FlashcardMask', help_text=b"A mask which overrides the card's mask", null=True), + ), + ] diff --git a/flashcards/models.py b/flashcards/models.py index 61ded13..246532c 100644 --- a/flashcards/models.py +++ b/flashcards/models.py @@ -53,7 +53,7 @@ class UserFlashcard(Model): 3. A user has a flashcard hidden from them """ user = ForeignKey('User') - mask = ForeignKey('FlashcardMask', help_text="A mask which overrides the card's mask") + mask = ForeignKey('FlashcardMask', blank=True, null=True, help_text="A mask which overrides the card's mask") pulled = DateTimeField(blank=True, null=True, help_text="When the user pulled the card") flashcard = ForeignKey('Flashcard') unpulled = DateTimeField(blank=True, null=True, help_text="When the user unpulled this card")