mam/mamweb
11
0
Fork 0
Code Issues Pull requests 9 Projects Wiki Activity Actions

Upgrade odevzdavatka #30

Merged
zelvuska merged 37 commits from upgrade_odevzdavatka into master 2023-06-19 20:48:30 +02:00
Conversation 3 Commits 37 Files changed 15 +6 -6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 205aa0b900 - Show all commits

12
odevzdavatko/views.py
View file

@ -415,8 +415,8 @@ class NahrajReseniView(LoginRequiredMixin, CreateView):
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
# Zaříznutí nezadaných problémů # Zaříznutí nezadaných problémů
nadproblem_id = self.kwargs["nadproblem_id"] nadproblem_id = self.kwargs["nadproblem_id"]
nadproblem = get_object_or_404(m.Problem, id=nadproblem_id) self.nadproblem = get_object_or_404(m.Problem, id=nadproblem_id)
if nadproblem.stav != "zadany": if self.nadproblem.stav != "zadany":
raise PermissionDenied() raise PermissionDenied()
@ -433,10 +433,10 @@ class NahrajReseniView(LoginRequiredMixin, CreateView):
return super().get(request, *args, **kwargs) return super().get(request, *args, **kwargs)
def get_initial(self): def get_initial(self):
nadproblem_id = self.kwargs["nadproblem_id"] nadproblem_id = self.nadproblem.id
return { return {
"nadproblem_id": nadproblem_id, "nadproblem_id": nadproblem_id,
"problem": [] if m.Problem.objects.filter(stav=m.Problem.STAV_ZADANY, nadproblem__id=nadproblem_id) else nadproblem_id "problem": [] if self.nadproblem.podproblem.filter(stav=m.Problem.STAV_ZADANY).exists() else nadproblem_id
} }
@ -447,8 +447,8 @@ class NahrajReseniView(LoginRequiredMixin, CreateView):
else: else:
data['prilohy'] = f.ReseniSPrilohamiFormSet() data['prilohy'] = f.ReseniSPrilohamiFormSet()
data["nadproblem_id"] = self.kwargs["nadproblem_id"] data["nadproblem_id"] = self.nadproblem.id
data["nadproblem"] = get_object_or_404(m.Problem, id=self.kwargs["nadproblem_id"]) data["nadproblem"] = get_object_or_404(m.Problem, id=self.nadproblem.id)
return data return data
# FIXME prepsat tak, aby form_valid se volalo jen tehdy, kdyz je form i formset validni # FIXME prepsat tak, aby form_valid se volalo jen tehdy, kdyz je form i formset validni