.
This commit is contained in:
@@ -253,11 +253,6 @@ class SeriesUpdate(
|
||||
self.object = form.save(commit=False)
|
||||
self.object.save()
|
||||
|
||||
# Do this in the form.save()
|
||||
# new_exams = list(form.cleaned_data['exams'].values_list("pk", flat=True))
|
||||
# self.object.exams.clear()
|
||||
# self.object.exams.add(*new_exams)
|
||||
|
||||
form.instance.author.add(self.request.user.id)
|
||||
|
||||
context = self.get_context_data(form=form)
|
||||
@@ -300,11 +295,6 @@ class AtlasCreateBase(RevisionMixin, LoginRequiredMixin, CreateView):
|
||||
|
||||
self.object.save()
|
||||
|
||||
# Do this in the form.save()
|
||||
# new_exams = list(form.cleaned_data['exams'].values_list("pk", flat=True))
|
||||
# self.object.exams.clear()
|
||||
# self.object.exams.add(*new_exams)
|
||||
|
||||
form.instance.author.add(self.request.user.id)
|
||||
|
||||
context = self.get_context_data(form=form)
|
||||
@@ -365,19 +355,10 @@ class AtlasUpdate(
|
||||
return context
|
||||
|
||||
def form_valid(self, form):
|
||||
# save exam orders (there must be a better way to do this)
|
||||
exam_orders = {}
|
||||
for exam in self.object.exams.all():
|
||||
exam_orders[exam] = list(exam.exam_questions.all())
|
||||
|
||||
self.object = form.save(commit=False)
|
||||
self.object.save()
|
||||
|
||||
# Do this in the form.save()
|
||||
# new_exams = list(form.cleaned_data['exams'].values_list("pk", flat=True))
|
||||
# self.object.exams.clear()
|
||||
# self.object.exams.add(*new_exams)
|
||||
|
||||
form.instance.author.add(self.request.user.id)
|
||||
|
||||
context = self.get_context_data(form=form)
|
||||
@@ -388,13 +369,6 @@ class AtlasUpdate(
|
||||
series_formset.instance = self.object
|
||||
series_formset.save()
|
||||
|
||||
# restore exam orders
|
||||
for exam in self.object.exams.all():
|
||||
if exam in exam_orders and self.object in exam_orders[exam]:
|
||||
print(exam_orders[exam])
|
||||
exam.exam_questions.set(exam_orders[exam])
|
||||
exam.save()
|
||||
|
||||
return response
|
||||
else:
|
||||
return super().form_invalid(form)
|
||||
|
||||
Reference in New Issue
Block a user