ross/penracourses
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Ross
2021-11-25 18:14:07 +00:00
parent e11ca878e5
commit f0b6829166
1 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
atlas/views.py
-26
View File
@@ -253,11 +253,6 @@ class SeriesUpdate(
self.object = form.save(commit=False) self.object = form.save(commit=False)
self.object.save() 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) form.instance.author.add(self.request.user.id)
context = self.get_context_data(form=form) context = self.get_context_data(form=form)
@@ -300,11 +295,6 @@ class AtlasCreateBase(RevisionMixin, LoginRequiredMixin, CreateView):
self.object.save() 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) form.instance.author.add(self.request.user.id)
context = self.get_context_data(form=form) context = self.get_context_data(form=form)
@@ -365,19 +355,10 @@ class AtlasUpdate(
return context return context
def form_valid(self, form): 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 = form.save(commit=False)
self.object.save() 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) form.instance.author.add(self.request.user.id)
context = self.get_context_data(form=form) context = self.get_context_data(form=form)
@@ -388,13 +369,6 @@ class AtlasUpdate(
series_formset.instance = self.object series_formset.instance = self.object
series_formset.save() 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 return response
else: else:
return super().form_invalid(form) return super().form_invalid(form)