numerous updates

atlas/forms.py

@@ -55,7 +55,7 @@ class ConditionForm(ModelForm):
 class CaseCollectionForm(ModelForm):
     class Meta:
         model = CaseCollection
-        exclude = ["cases", "valid_users"]
+        exclude = ["cases", "valid_cid_users"]
 
     def __init__(self, *args, **kwargs):
         self.user = kwargs.pop(

atlas/migrations/0045_rename_valid_users_casecollection_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 = [
+        ('atlas', '0044_userreportanswer'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='casecollection',
+            old_name='valid_users',
+            new_name='valid_cid_users',
+        ),
+    ]

atlas/models.py

@@ -645,7 +645,7 @@ class CaseCollection(models.Model):
 
     cid_users = GenericRelation("generic.CidUserExam")
 
-    valid_users = models.ManyToManyField(
+    valid_cid_users = models.ManyToManyField(
         CidUser, blank=True, related_name="casecollection_exams"
     )
 
@@ -694,9 +694,9 @@ class CaseCollection(models.Model):
         if request is not None and request.user.is_superuser:
             return True
 
-        if self.valid_users.exists():
+        if self.valid_cid_users.exists():
 
-            user = self.valid_users.filter(cid=cid).first()
+            user = self.valid_cid_users.filter(cid=cid).first()
 
             if not user or user.passcode != passcode:
                 return False

atlas/views.py

@@ -1172,7 +1172,7 @@ def exam_cids(request, pk):
         request.user in collection.author.all()
         or request.user.groups.filter(name="cid_user_manager").exists()
     ):
-        cid_users = collection.valid_users.all()
+        cid_users = collection.valid_cid_users.all()
 
         cid_user_count = cid_users.count()
         return render(