Compare commits
No commits in common. "e26df0172963cccb306084d667ff8301d33a735b" and "92cb8ec206d6a353d113a4856b2718240de08b34" have entirely different histories.
e26df01729
...
92cb8ec206
3 changed files with 0 additions and 30 deletions
|
@ -89,13 +89,6 @@ class NahrajReseniForm(forms.ModelForm):
|
||||||
if 'problem' in self.fields:
|
if 'problem' in self.fields:
|
||||||
self.fields['problem'].label = "Všechny řešené problémy"
|
self.fields['problem'].label = "Všechny řešené problémy"
|
||||||
|
|
||||||
def clean_problem(self):
|
|
||||||
problem = self.cleaned_data.get('problem')
|
|
||||||
for p in problem:
|
|
||||||
if p.stav != m.Problem.STAV_ZADANY:
|
|
||||||
raise forms.ValidationError("Problém " + str(p) + " již nelze řešit!")
|
|
||||||
return problem
|
|
||||||
|
|
||||||
ReseniSPrilohamiFormSet = inlineformset_factory(m.Reseni,m.PrilohaReseni,
|
ReseniSPrilohamiFormSet = inlineformset_factory(m.Reseni,m.PrilohaReseni,
|
||||||
form = NahrajReseniForm,
|
form = NahrajReseniForm,
|
||||||
fields = ('soubor','res_poznamka'),
|
fields = ('soubor','res_poznamka'),
|
||||||
|
|
|
@ -30,13 +30,6 @@
|
||||||
{{ field }}
|
{{ field }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
{% if field.errors %}
|
|
||||||
<tr>
|
|
||||||
<td colspan="2"><span class="field-error">{{ field.errors }}</span></td>
|
|
||||||
</tr>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
@ -61,13 +54,6 @@
|
||||||
{{ field }}
|
{{ field }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
{% if field.errors %}
|
|
||||||
<tr>
|
|
||||||
<td colspan="2"><span class="field-error">{{ field.errors }}</span></td>
|
|
||||||
</tr>
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
{% endwith %}
|
{% endwith %}
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
@ -75,8 +61,6 @@
|
||||||
|
|
||||||
{% include "odevzdavatko/prilohy.html" %}
|
{% include "odevzdavatko/prilohy.html" %}
|
||||||
|
|
||||||
{{form.non_field_errors}}
|
|
||||||
|
|
||||||
<hr>
|
<hr>
|
||||||
<h4>Odevzdat řešení</h4>
|
<h4>Odevzdat řešení</h4>
|
||||||
<input type="submit" value="Odevzdat">
|
<input type="submit" value="Odevzdat">
|
||||||
|
|
|
@ -403,13 +403,6 @@ class NahrajReseniView(LoginRequiredMixin, CreateView):
|
||||||
form_class = f.NahrajReseniForm
|
form_class = f.NahrajReseniForm
|
||||||
|
|
||||||
def get(self, request, *args, **kwargs):
|
def get(self, request, *args, **kwargs):
|
||||||
# Zaříznutí nezadaných problémů
|
|
||||||
nadproblem_id = self.kwargs["nadproblem_id"]
|
|
||||||
nadproblem = get_object_or_404(m.Problem, id=nadproblem_id)
|
|
||||||
if nadproblem.stav != "zadany":
|
|
||||||
raise PermissionDenied()
|
|
||||||
|
|
||||||
|
|
||||||
# Zaříznutí starých řešitelů:
|
# Zaříznutí starých řešitelů:
|
||||||
# FIXME: Je to tady dost naprasené, mělo by to asi být jinde…
|
# FIXME: Je to tady dost naprasené, mělo by to asi být jinde…
|
||||||
osoba = m.Osoba.objects.get(user=self.request.user)
|
osoba = m.Osoba.objects.get(user=self.request.user)
|
||||||
|
|
Loading…
Reference in a new issue