This commit is contained in:
Ross
2022-03-01 19:01:08 +00:00
parent f7ba44a0a7
commit b37fc5ea6f
2 changed files with 17 additions and 16 deletions
+15 -15
View File
@@ -80,13 +80,13 @@ class RapidForm(ModelForm):
self.user = kwargs.pop(
"user"
) # To get request.user. Do not use kwargs.pop('user', None) due to potential security hole
if kwargs.get("instance"):
# We get the 'initial' keyword argument or initialize it
# as a dict if it didn't exist.
initial = kwargs.setdefault("initial", {})
# The widget for a ModelMultipleChoiceField expects
# a list of primary key for the selected data.
initial["exams"] = [t.pk for t in kwargs["instance"].exams.all()]
#if kwargs.get("instance"):
# # We get the 'initial' keyword argument or initialize it
# # as a dict if it didn't exist.
# initial = kwargs.setdefault("initial", {})
# # The widget for a ModelMultipleChoiceField expects
# # a list of primary key for the selected data.
# initial["exams"] = [t.pk for t in kwargs["instance"].exams.all()]
ModelForm.__init__(self, *args, **kwargs)
super(RapidForm, self).__init__(*args, **kwargs)
@@ -132,16 +132,16 @@ class RapidForm(ModelForm):
instance.save()
self.save_m2m()
old_exams = instance.exams.all()
#old_exams = instance.exams.all()
new_exams = self.cleaned_data["exams"]
#new_exams = self.cleaned_data["exams"]
for exam in old_exams:
if exam in new_exams:
exam.exam_questions.add(instance)
else:
exam.exam_questions.remove(instance)
exam.save()
#for exam in old_exams:
# if exam in new_exams:
# exam.exam_questions.add(instance)
# else:
# exam.exam_questions.remove(instance)
# exam.save()
# # Prepare a 'save_m2m' method for the form,
# old_save_m2m = self.save_m2m