From 5daeefbcecfce3e4b2b7ebf288f46dedee4c3e00 Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Thu, 18 Oct 2018 10:02:02 +0200 Subject: [PATCH] Remove custom assignments, add `user created` flag --- .../migrations/0003_auto_20181018_0800.py | 25 +++++++++++++++++++ server/assignments/models.py | 5 +--- server/books/schema/mutations/utils.py | 1 + 3 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 server/assignments/migrations/0003_auto_20181018_0800.py diff --git a/server/assignments/migrations/0003_auto_20181018_0800.py b/server/assignments/migrations/0003_auto_20181018_0800.py new file mode 100644 index 00000000..9b15e907 --- /dev/null +++ b/server/assignments/migrations/0003_auto_20181018_0800.py @@ -0,0 +1,25 @@ +# Generated by Django 2.0.6 on 2018-10-18 08:00 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('assignments', '0002_auto_20181015_1237'), + ] + + operations = [ + migrations.RemoveField( + model_name='customassignment', + name='assignment_ptr', + ), + migrations.AddField( + model_name='assignment', + name='user_created', + field=models.BooleanField(default=False), + ), + migrations.DeleteModel( + name='CustomAssignment', + ), + ] diff --git a/server/assignments/models.py b/server/assignments/models.py index 86bb9846..c3b78d15 100644 --- a/server/assignments/models.py +++ b/server/assignments/models.py @@ -12,15 +12,12 @@ class Assignment(TimeStampedModel): owner = models.ForeignKey(get_user_model(), on_delete=models.PROTECT) # probably don't want to delete all assignments if a user gets deleted module = models.ForeignKey(Module, related_name='assignments', on_delete=models.CASCADE) + user_created = models.BooleanField(default=False) def __str__(self): return self.title -class CustomAssignment(Assignment): - pass - - class StudentSubmission(TimeStampedModel): text = models.TextField(blank=True) document = models.URLField(blank=True, default='', max_length=255) diff --git a/server/books/schema/mutations/utils.py b/server/books/schema/mutations/utils.py index f2aae216..fcbd0c3d 100644 --- a/server/books/schema/mutations/utils.py +++ b/server/books/schema/mutations/utils.py @@ -50,6 +50,7 @@ def handle_content_block(content, context, module, allowed_blocks=ALLOWED_BLOCKS assignment=content['value']['assignment'], owner=context.user, module=module, + user_created=True ) return {