Remove custom assignments, add `user created` flag
This commit is contained in:
parent
13717c1371
commit
5daeefbcec
|
|
@ -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',
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -12,15 +12,12 @@ class Assignment(TimeStampedModel):
|
||||||
owner = models.ForeignKey(get_user_model(),
|
owner = models.ForeignKey(get_user_model(),
|
||||||
on_delete=models.PROTECT) # probably don't want to delete all assignments if a user gets deleted
|
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)
|
module = models.ForeignKey(Module, related_name='assignments', on_delete=models.CASCADE)
|
||||||
|
user_created = models.BooleanField(default=False)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.title
|
return self.title
|
||||||
|
|
||||||
|
|
||||||
class CustomAssignment(Assignment):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class StudentSubmission(TimeStampedModel):
|
class StudentSubmission(TimeStampedModel):
|
||||||
text = models.TextField(blank=True)
|
text = models.TextField(blank=True)
|
||||||
document = models.URLField(blank=True, default='', max_length=255)
|
document = models.URLField(blank=True, default='', max_length=255)
|
||||||
|
|
|
||||||
|
|
@ -50,6 +50,7 @@ def handle_content_block(content, context, module, allowed_blocks=ALLOWED_BLOCKS
|
||||||
assignment=content['value']['assignment'],
|
assignment=content['value']['assignment'],
|
||||||
owner=context.user,
|
owner=context.user,
|
||||||
module=module,
|
module=module,
|
||||||
|
user_created=True
|
||||||
)
|
)
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue