mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Merge branch 'data_migrations' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into data_migrations

Browse source
This commit is contained in:
Anet 2020-05-21 00:13:50 +02:00
commit 06ee2953da
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
seminar/forms.py
View file

@ -257,6 +257,7 @@ class NahrajReseniForm(forms.ModelForm):
class Meta: class Meta:
model = m.Reseni model = m.Reseni
fields = ('problem',) fields = ('problem',)
help_texts = {'problem':''} # Nezobrazovat help text ve formuláři
widgets = {'problem': widgets = {'problem':
autocomplete.ModelSelect2Multiple( autocomplete.ModelSelect2Multiple(
@ -272,6 +273,7 @@ ReseniSPrilohamiFormSet = inlineformset_factory(m.Reseni,m.PrilohaReseni,
fields = ('soubor','res_poznamka'), fields = ('soubor','res_poznamka'),
widgets = {'res_poznamka':forms.TextInput()}, widgets = {'res_poznamka':forms.TextInput()},
extra = 1, extra = 1,
can_delete = False,
) )

2
seminar/urls.py
View file

@ -118,7 +118,7 @@ urlpatterns = [
path('autocomplete/problem/odevzdatelny',views.OdevzdatelnyProblemAutocomplete.as_view(), name='autocomplete_problem_odevzdatelny'), path('autocomplete/problem/odevzdatelny',views.OdevzdatelnyProblemAutocomplete.as_view(), name='autocomplete_problem_odevzdatelny'),
path('temp/add_solution', views.AddSolutionView.as_view(),name='seminar_vloz_reseni'), path('temp/add_solution', views.AddSolutionView.as_view(),name='seminar_vloz_reseni'),
path('temp/submit_solution', views.SubmitSolutionView.as_view(),name='seminar_nahraj_reseni'), path('temp/nahraj_reseni', views.NahrajReseniView.as_view(),name='seminar_nahraj_reseni'),
path('', views.TitulniStranaView.as_view(), name='titulni_strana'), path('', views.TitulniStranaView.as_view(), name='titulni_strana'),

2
seminar/views/views_all.py
View file

@ -1230,7 +1230,7 @@ class AddSolutionView(LoginRequiredMixin, FormView):
form_class = f.VlozReseniForm form_class = f.VlozReseniForm
success_url = '/' success_url = '/'
class SubmitSolutionView(LoginRequiredMixin, CreateView): class NahrajReseniView(LoginRequiredMixin, CreateView):
model = s.Reseni model = s.Reseni
template_name = 'seminar/nahraj_reseni.html' template_name = 'seminar/nahraj_reseni.html'
form_class = f.NahrajReseniForm form_class = f.NahrajReseniForm