Further user management improvements

generic/forms.py

@@ -143,6 +143,22 @@ class QuestionNoteForm(ModelForm):
 
 
 class CidUserForm(ModelForm):
+
+    class Meta:
+        model = CidUser
+        fields = [
+            "passcode",
+            "active",
+            "internal_candidate",
+            "name",
+            "email",
+            "supervisor",
+            "login_email_sent",
+            "results_email_sent",
+            "group",
+        ]
+
+class CidUserExamForm(ModelForm):
     def __init__(self, *args, **kwargs):
         if kwargs.get("instance"):
             # We get the 'initial' keyword argument or initialize it
@@ -169,7 +185,7 @@ class CidUserForm(ModelForm):
 
         ModelForm.__init__(self, *args, **kwargs)
 
-        super(CidUserForm, self).__init__(*args, **kwargs)
+        super(CidUserExamForm, self).__init__(*args, **kwargs)
 
         self.fields["physics_exams"] = ModelMultipleChoiceField(
             required=False,
@@ -244,21 +260,9 @@ class CidUserForm(ModelForm):
         self.save_m2m()
 
         return instance
-
     class Meta:
         model = CidUser
-        fields = [
-            "passcode",
-            "active",
-            "internal_candidate",
-            "name",
-            "email",
-            "supervisor",
-            "login_email_sent",
-            "results_email_sent",
-            "group",
-        ]
-
+        fields = []
 
 class CidUserGroupModelChoiceField(ModelMultipleChoiceField):
     def label_from_instance(self, obj):