From eb38c6daf35cbf32d1174dff8ba52792b0e0a10f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C?= <katterrina98@gmail.com>
Date: Tue, 27 Apr 2021 22:11:21 +0200
Subject: [PATCH 1/3] =?UTF-8?q?odkaz=20na=20jak=20=C5=99e=C5=A1it=20z=20ak?=
 =?UTF-8?q?tu=C3=A1ln=C3=ADho=20zad=C3=A1n=C3=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 seminar/templates/seminar/zadani/AktualniZadani.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 %}
-		<h3>Aktuální témata najdete v <a href="{{ac.pdf.url}}">aktuálním čísle v PDF</a>.</h3>
+		<br><br>Jak seminář M&M funguje? Podívejte se na stránku <a href="/jak-resit/">Jak řešit</a>.<br>
+		<h3>Aktuální témata najdete v <a href="{{ac.pdf.url}}">aktuálním čísle v PDF</a>.</h3><br>
+		
 	{% endif %}
 
 	{% if user.je_org and not verejne%}</div>{% endif %}

From 4a4ac62dce7680649678c6d7cc24eca5b4904844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kate=C5=99ina=20=C4=8C?= <katterrina98@gmail.com>
Date: Tue, 27 Apr 2021 22:34:12 +0200
Subject: [PATCH 2/3] temp -> org v urls

---
 seminar/urls.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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/<int:problem>/<int:resitel>/', org_required(views.ReseniProblemuView.as_view()), name='odevzdavatko_reseni_resitele_k_problemu'),
-	path('temp/reseni/<int:pk>', 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/<int:problem>/<int:resitel>/', org_required(views.ReseniProblemuView.as_view()), name='odevzdavatko_reseni_resitele_k_problemu'),
+	path('org/reseni/<int:pk>', 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())),
 ]

From f255d1512db158f64208f0eb20eeeaafa4f3126f Mon Sep 17 00:00:00 2001
From: "Pavel \"LEdoian\" Turinsky" <ledoian@matfyz.cz>
Date: Tue, 27 Apr 2021 22:34:08 +0200
Subject: [PATCH 3/3] Fix

---
 seminar/migrations/0052_user_to_organizator.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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()