numerous updates

generic/forms.py

@@ -9,8 +9,9 @@ from django.forms import (
 )
 from django.forms import inlineformset_factory
 from atlas.models import CaseCollection
+from django.contrib.auth.models import User
 
-from generic.models import CidUser, CidUserGroup, Examination, QuestionNote
+from generic.models import CidUser, CidUserGroup, Examination, QuestionNote, UserUserGroup
 
 from django.contrib.admin.widgets import FilteredSelectMultiple
 from django.forms.widgets import RadioSelect, TextInput, Textarea
@@ -205,4 +206,14 @@ class CidUserForm(ModelForm):
 class CidUserGroupForm(ModelForm):
     class Meta:
         model = CidUserGroup
-        fields = ["name", "archive"]
+        fields = ["name", "archive"]
+
+class UserUserGroupForm(ModelForm):
+    users = ModelMultipleChoiceField(
+        required=False,
+        queryset=User.objects.all(),
+        widget=FilteredSelectMultiple(verbose_name="Users", is_stacked=False),
+    )
+    class Meta:
+        model = UserUserGroup
+        fields = ["name", "archive", "users"]