.
This commit is contained in:
@@ -8,6 +8,7 @@ from django.forms import (
|
|||||||
HiddenInput,
|
HiddenInput,
|
||||||
)
|
)
|
||||||
from django.forms import inlineformset_factory
|
from django.forms import inlineformset_factory
|
||||||
|
from atlas.models import CaseCollection
|
||||||
|
|
||||||
from generic.models import CidUser, CidUserGroup, Examination, QuestionNote
|
from generic.models import CidUser, CidUserGroup, Examination, QuestionNote
|
||||||
|
|
||||||
@@ -104,6 +105,7 @@ class CidUserForm(ModelForm):
|
|||||||
initial["sba_exams"] = [t.pk for t in kwargs["instance"].sba_exams.all()]
|
initial["sba_exams"] = [t.pk for t in kwargs["instance"].sba_exams.all()]
|
||||||
initial["rapid_exams"] = [t.pk for t in kwargs["instance"].rapid_exams.all()]
|
initial["rapid_exams"] = [t.pk for t in kwargs["instance"].rapid_exams.all()]
|
||||||
initial["longs_exams"] = [t.pk for t in kwargs["instance"].longs_exams.all()]
|
initial["longs_exams"] = [t.pk for t in kwargs["instance"].longs_exams.all()]
|
||||||
|
initial["casecollection_exams"] = [t.pk for t in kwargs["instance"].casecollection_exams.all()]
|
||||||
|
|
||||||
ModelForm.__init__(self, *args, **kwargs)
|
ModelForm.__init__(self, *args, **kwargs)
|
||||||
|
|
||||||
@@ -134,6 +136,11 @@ class CidUserForm(ModelForm):
|
|||||||
queryset=LongsExam.objects.filter(archive=False),
|
queryset=LongsExam.objects.filter(archive=False),
|
||||||
widget=FilteredSelectMultiple(verbose_name="Long Exams", is_stacked=False),
|
widget=FilteredSelectMultiple(verbose_name="Long Exams", is_stacked=False),
|
||||||
)
|
)
|
||||||
|
self.fields["casecollection_exams"] = ModelMultipleChoiceField(
|
||||||
|
required=False,
|
||||||
|
queryset=CaseCollection.objects.filter(archive=False),
|
||||||
|
widget=FilteredSelectMultiple(verbose_name="Case Collection", is_stacked=False),
|
||||||
|
)
|
||||||
|
|
||||||
def save(self, commit=True):
|
def save(self, commit=True):
|
||||||
# Get the unsaved Long instance
|
# Get the unsaved Long instance
|
||||||
@@ -159,6 +166,8 @@ class CidUserForm(ModelForm):
|
|||||||
instance.longs_exams.clear()
|
instance.longs_exams.clear()
|
||||||
for longs_exams in self.cleaned_data["longs_exams"]:
|
for longs_exams in self.cleaned_data["longs_exams"]:
|
||||||
instance.longs_exams.add(longs_exams.pk)
|
instance.longs_exams.add(longs_exams.pk)
|
||||||
|
for casecollection_exams in self.cleaned_data["casecollection_exams"]:
|
||||||
|
instance.longs_exams.add(casecollection_exams.pk)
|
||||||
|
|
||||||
self.save_m2m = save_m2m
|
self.save_m2m = save_m2m
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user