numerous updates

longs/migrations/0060_rename_valid_users_exam_valid_cid_users.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.13 on 2022-05-20 10:45
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('longs', '0059_exam_authors_only'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='exam',
+            old_name='valid_users',
+            new_name='valid_cid_users',
+        ),
+    ]

longs/migrations/0061_exam_valid_user_users.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.2.13 on 2022-05-20 12:42
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('longs', '0060_rename_valid_users_exam_valid_cid_users'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='exam',
+            name='valid_user_users',
+            field=models.ManyToManyField(blank=True, related_name='user_longs_exams', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

longs/models.py

@@ -595,7 +595,11 @@ class Exam(ExamBase):
 
     double_mark = models.BooleanField(default=True, help_text="Defines if an exam is expected to be double marked")
 
-    valid_users = models.ManyToManyField(CidUser, blank=True, related_name="longs_exams")
+    valid_cid_users = models.ManyToManyField(CidUser, blank=True, related_name="longs_exams")
+
+    valid_user_users = models.ManyToManyField(
+        settings.AUTH_USER_MODEL, blank=True, related_name="user_longs_exams"
+    )
 
     def get_exam_question_json(self, question_id):
         q = get_object_or_404(Long, pk=question_id)