diff --git a/seminar/migrations/0052_user_to_organizator.py b/seminar/migrations/0052_user_to_organizator.py index 8d689a8c..ee844d1d 100644 --- a/seminar/migrations/0052_user_to_organizator.py +++ b/seminar/migrations/0052_user_to_organizator.py @@ -57,8 +57,8 @@ def spoj_k_organizatorum_osoby(apps, scema_editor): osoba.jmeno = user.first_name osoba.prijmeni = user.last_name osoba.email = user.email - user.jmeno += " (Uživatel!)" - user.prijmeni += " (Uživatel!)" + user.first_name += " (Uživatel!)" + user.last_name += " (Uživatel!)" osoba.datum_registrace = min(osoba.datum_registrace, user.date_joined, key=lambda d: d if d is not None else date.max) user.save() diff --git a/seminar/templates/seminar/zadani/AktualniZadani.html b/seminar/templates/seminar/zadani/AktualniZadani.html index b60dbe4a..4889088f 100644 --- a/seminar/templates/seminar/zadani/AktualniZadani.html +++ b/seminar/templates/seminar/zadani/AktualniZadani.html @@ -37,7 +37,9 @@ {% endif %} {% if ac.pdf %} -

Aktuální témata najdete v aktuálním čísle v PDF.

+

Jak seminář M&M funguje? Podívejte se na stránku Jak řešit.
+

Aktuální témata najdete v aktuálním čísle v PDF.


+ {% endif %} {% if user.je_org and not verejne%}{% endif %} diff --git a/seminar/urls.py b/seminar/urls.py index 14973445..755e1efd 100644 --- a/seminar/urls.py +++ b/seminar/urls.py @@ -155,7 +155,7 @@ urlpatterns = [ path('api/autocomplete/resitel/', org_required(views.ResitelAutocomplete.as_view()), name='autocomplete_resitel'), path('api/autocomplete/problem/odevzdatelny',views.OdevzdatelnyProblemAutocomplete.as_view(), name='autocomplete_problem_odevzdatelny'), - path('temp/add_solution', org_required(views.AddSolutionView.as_view()), name='seminar_vloz_reseni'), + path('org/add_solution', org_required(views.AddSolutionView.as_view()), name='seminar_vloz_reseni'), path('resitel/nahraj_reseni', resitel_required(views.NahrajReseniView.as_view()), name='seminar_nahraj_reseni'), re_path(r'^temp/vue/.*$',views.VueTestView.as_view(),name='vue_test_view'), @@ -169,9 +169,9 @@ urlpatterns = [ # org_member_required(views.OrganizatorAutocomplete.as_view()), # name='seminar_autocomplete_organizator') - path('temp/reseni/', org_required(views.TabulkaOdevzdanychReseniView.as_view()), name='odevzdavatko_tabulka'), - path('temp/reseni///', org_required(views.ReseniProblemuView.as_view()), name='odevzdavatko_reseni_resitele_k_problemu'), - path('temp/reseni/', org_required(viewMethodSwitch(get=views.DetailReseniView.as_view(), post=views.hodnoceniReseniView)), name='odevzdavatko_detail_reseni'), - path('temp/reseni/all', org_required(views.SeznamReseniView.as_view())), - path('temp/reseni/akt', org_required(views.SeznamAktualnichReseniView.as_view())), + path('org/reseni/', org_required(views.TabulkaOdevzdanychReseniView.as_view()), name='odevzdavatko_tabulka'), + path('org/reseni///', org_required(views.ReseniProblemuView.as_view()), name='odevzdavatko_reseni_resitele_k_problemu'), + path('org/reseni/', org_required(viewMethodSwitch(get=views.DetailReseniView.as_view(), post=views.hodnoceniReseniView)), name='odevzdavatko_detail_reseni'), + path('org/reseni/all', org_required(views.SeznamReseniView.as_view())), + path('org/reseni/akt', org_required(views.SeznamAktualnichReseniView.as_view())), ]