a few more management changes

This commit is contained in:
Ross
2024-08-12 10:56:20 +01:00
parent 6fe2bae8a8
commit 2d185aa95f
5 changed files with 21 additions and 7 deletions
+11 -4
View File
@@ -206,23 +206,30 @@ class ExamGroupsFormMixin(ModelForm):
def __init__(self, *args, user, **kwargs) -> None:
super(ModelForm, self).__init__(*args, **kwargs)
# TODO: decide how we should handle managing user groups
# i.e who should be able to access a list of all users?
if user.is_superuser or user.groups.filter(name="cid_user_manager").exists():
cid_user_group_queryset = CidUserGroup.objects.filter(archive=False)
user_user_group_queryset = UserUserGroup.objects.filter(archive=False)
else:
cid_user_group_queryset = CidUserGroup.objects.none()
user_user_group_queryset = UserUserGroup.objects.none()
cid_user_group_queryset = CidUserGroup.objects.filter(archive=False, open_access=True)
user_user_group_queryset = UserUserGroup.objects.none(archive=False, open_access=True)
#cid_user_group_queryset = CidUserGroup.objects.none()
#user_user_group_queryset = UserUserGroup.objects.none()
self.fields["cid_user_groups"] = ModelMultipleChoiceField(
required=False,
queryset=cid_user_group_queryset,
label="CID User Groups",
)
self.fields["user_user_groups"] = ModelMultipleChoiceField(
required=False,
queryset=user_user_group_queryset,
label="User Groups",
)
self.fields["cid_user_groups"].widget.attrs["size"] = 8
self.fields["user_user_groups"].widget.attrs["size"] = 8
class ExaminationForm(ModelForm):
@@ -414,7 +421,7 @@ class CidUserGroupModelChoiceField(ModelMultipleChoiceField):
class CidUserGroupForm(ModelForm):
class Meta:
model = CidUserGroup
fields = ["name", "archive"]
fields = ["name", "archive", "open_access"]
class UserUserGroupModelChoiceField(ModelMultipleChoiceField):
@@ -431,7 +438,7 @@ class UserUserGroupForm(ModelForm):
class Meta:
model = UserUserGroup
fields = ["name", "archive", "users"]
fields = ["name", "archive", "open_access", "users"]
class UserGroupExamForm(ModelForm):