Merge branch 'data_migrations' of gimli.ms.mff.cuni.cz:/akce/mam/git/mamweb into data_migrations
This commit is contained in:
		
						commit
						73a997956c
					
				
					 1 changed files with 38 additions and 39 deletions
				
			
		|  | @ -1,5 +1,4 @@ | |||
| from django.conf.urls import *  # NOQA | ||||
| from django.conf.urls import url, include | ||||
| from django.urls import path, include | ||||
| from django.contrib.auth.decorators import user_passes_test | ||||
| from . import views, export | ||||
| from .utils import staff_member_required | ||||
|  | @ -9,100 +8,100 @@ staff_member_required = user_passes_test(lambda u: u.is_staff) | |||
| 
 | ||||
| urlpatterns = [ | ||||
| 	# REDIRECTy | ||||
| 	url('jak-resit/', RedirectView.as_view(url='/co-je-MaM/jak-resit/')), | ||||
| 	path('jak-resit/', RedirectView.as_view(url='/co-je-MaM/jak-resit/')), | ||||
| 
 | ||||
| 	# Organizatori | ||||
| 	url('co-je-MaM/organizatori/', views.CojemamOrganizatoriView.as_view(), name='organizatori'), | ||||
| 	url('co-je-MaM/organizatori/organizovali/', views.CojemamOrganizatoriStariView.as_view(), name='stari_organizatori'), | ||||
| 	path('co-je-MaM/organizatori/', views.CojemamOrganizatoriView.as_view(), name='organizatori'), | ||||
| 	path('co-je-MaM/organizatori/organizovali/', views.CojemamOrganizatoriStariView.as_view(), name='stari_organizatori'), | ||||
| 
 | ||||
| 	# Archiv | ||||
| 	url('archiv/cisla/', views.ArchivView.as_view()), | ||||
| 	url('archiv/temata/', views.ArchivTemataView.as_view()), | ||||
| 	path('archiv/cisla/', views.ArchivView.as_view()), | ||||
| 	path('archiv/temata/', views.ArchivTemataView.as_view()), | ||||
| 
 | ||||
| 	url('rocnik/<int:rocnik>/', views.RocnikView.as_view(), name='seminar_rocnik'), | ||||
| 	#url('cislo/<int:rocnik>.<int:cislo>/', views.CisloView.as_view(), name='seminar_cislo'), | ||||
| 	url('problem/<int:pk>/', views.ProblemView.as_view(), name='seminar_problem'), | ||||
| 	#url('problem/(?P<pk>\d+)/(?P<prispevek>\d+)/', views.PrispevekView.as_view(), name='seminar_problem_prispevek'), | ||||
| 	path('rocnik/<int:rocnik>/', views.RocnikView.as_view(), name='seminar_rocnik'), | ||||
| 	#path('cislo/<int:rocnik>.<int:cislo>/', views.CisloView.as_view(), name='seminar_cislo'), | ||||
| 	path('problem/<int:pk>/', views.ProblemView.as_view(), name='seminar_problem'), | ||||
| 	#path('problem/(?P<pk>\d+)/(?P<prispevek>\d+)/', views.PrispevekView.as_view(), name='seminar_problem_prispevek'), | ||||
| 
 | ||||
| 	# Soustredeni | ||||
| 	url( | ||||
| 	path( | ||||
| 		'soustredeni/probehlo/', | ||||
| 		views.SoustredeniListView.as_view(), | ||||
| 		name='seminar_seznam_soustredeni' | ||||
| 	), | ||||
| 	url( | ||||
| 	path( | ||||
| 		'soustredeni/probehlo/<int:soustredeni>/', | ||||
| 		views.SoustredeniView.as_view(), | ||||
| 		name='seminar_soustredeni' | ||||
| 	), | ||||
| 	url( | ||||
| 	path( | ||||
| 		'soustredeni/<int:soustredeni>/seznam_ucastniku', | ||||
| 		staff_member_required(views.SoustredeniUcastniciView.as_view()), | ||||
| 		name='soustredeni_ucastnici' | ||||
| 	), | ||||
| 	url( | ||||
| 	path( | ||||
| 		'soustredeni/<int:soustredeni>/maily_ucastniku', | ||||
| 		staff_member_required(views.SoustredeniMailyUcastnikuView.as_view()), | ||||
| 		name='maily_ucastniku' | ||||
| 	), | ||||
| 	url( | ||||
| 	path( | ||||
| 		'soustredeni/<int:soustredeni>/export_ucastniku', | ||||
| 		staff_member_required(views.soustredeniUcastniciExportView), | ||||
| 		name='soustredeni_ucastnici_export' | ||||
| 	), | ||||
| 	url( | ||||
| 	path( | ||||
| 		'soustredeni/<int:soustredeni>/fotogalerie/', | ||||
| 		include('galerie.urls') | ||||
| 	), | ||||
| 
 | ||||
| 	# Zadani | ||||
| 	url('zadani/aktualni/', views.AktualniZadaniView, name='seminar_aktualni_zadani'), | ||||
| 	url('zadani/temata/', views.ZadaniTemataView, name='seminar_temata'), | ||||
| 	#url('zadani/vysledkova-listina/', views.ZadaniAktualniVysledkovkaView, name='seminar_vysledky'), | ||||
| 	url('', views.TitulniStranaView.as_view(), name='titulni_strana'), | ||||
| 	url('stare-novinky/', views.StareNovinkyView.as_view(), name='stare_novinky'), | ||||
| 	path('zadani/aktualni/', views.AktualniZadaniView, name='seminar_aktualni_zadani'), | ||||
| 	path('zadani/temata/', views.ZadaniTemataView, name='seminar_temata'), | ||||
| 	#path('zadani/vysledkova-listina/', views.ZadaniAktualniVysledkovkaView, name='seminar_vysledky'), | ||||
| 	path('stare-novinky/', views.StareNovinkyView.as_view(), name='stare_novinky'), | ||||
| 
 | ||||
| 	# Clanky | ||||
| 	url('clanky/resitel/', views.ClankyResitelView.as_view(), name='clanky_resitel'), | ||||
| 	#url('clanky/org/', views.ClankyOrganizatorView.as_view(), name='clanky_organizator'), | ||||
| 	path('clanky/resitel/', views.ClankyResitelView.as_view(), name='clanky_resitel'), | ||||
| 	#path('clanky/org/', views.ClankyOrganizatorView.as_view(), name='clanky_organizator'), | ||||
| 
 | ||||
| 	# Aesop | ||||
| 	url('aesop-export/mam-rocnik-<int:prvni_rok>.csv', export.ExportRocnikView.as_view(), name='seminar_export_rocnik'), | ||||
| 	url('aesop-export/mam-sous-<str:datum_zacatku>.csv', export.ExportSousView.as_view(), name='seminar_export_sous'), | ||||
| 	url('aesop-export/index.csv', export.ExportIndexView.as_view(), name='seminar_export_index'), | ||||
| 	path('aesop-export/mam-rocnik-<int:prvni_rok>.csv', export.ExportRocnikView.as_view(), name='seminar_export_rocnik'), | ||||
| 	path('aesop-export/mam-sous-<str:datum_zacatku>.csv', export.ExportSousView.as_view(), name='seminar_export_sous'), | ||||
| 	path('aesop-export/index.csv', export.ExportIndexView.as_view(), name='seminar_export_index'), | ||||
| 
 | ||||
| 	# Stranky viditelne pouze pro orgy: | ||||
| 	#url( | ||||
| 	#path( | ||||
| 	#    'rocnik/(?P<rocnik>\d+)/vysledkovka.tex', | ||||
| 	#    staff_member_required(views.RocnikVysledkovkaView.as_view()), | ||||
| 	#    name='seminar_cislo_vysledkovka' | ||||
| 	#), | ||||
| 	#url('cislo/(?P<rocnik>\d+).(?P<cislo>[0-9-]+)/vysledkovka.tex', | ||||
| 	#path('cislo/(?P<rocnik>\d+).(?P<cislo>[0-9-]+)/vysledkovka.tex', | ||||
| 	 #   staff_member_required(views.CisloVysledkovkaView.as_view()), name='seminar_cislo_vysledkovka'), | ||||
| 	url('cislo/<int:rocnik>.<int:cislo>/obalky.pdf', | ||||
| 	path('cislo/<int:rocnik>.<int:cislo>/obalky.pdf', | ||||
| 		staff_member_required(views.cisloObalkyView), name='seminar_cislo_obalky'), | ||||
| 
 | ||||
| 	#url('cislo/(?P<rocnik>\d+).(?P<cislo>[0-9-]+)/tituly.tex', | ||||
| 	#path('cislo/(?P<rocnik>\d+).(?P<cislo>[0-9-]+)/tituly.tex', | ||||
| 	 #   staff_member_required(views.TitulyView), name='seminar_cislo_titul'), | ||||
| 	url('stav', | ||||
| 	path('stav', | ||||
| 		staff_member_required(views.StavDatabazeView), name='stav_databaze'), | ||||
| 	url('cislo/<int:rocnik>.<int:cislo>/obalkovani', | ||||
| 	path('cislo/<int:rocnik>.<int:cislo>/obalkovani', | ||||
| 		staff_member_required(views.obalkovaniView), name='seminar_cislo_resitel_obalkovani'), | ||||
| 	url('cislo/<int:rocnik>.<int:cislo>/tex-download.json', | ||||
| 	path('cislo/<int:rocnik>.<int:cislo>/tex-download.json', | ||||
| 		staff_member_required(views.texDownloadView), name='seminar_tex_download'), | ||||
| 	url('soustredeni/<int:soustredeni>/obalky.pdf', | ||||
| 	path('soustredeni/<int:soustredeni>/obalky.pdf', | ||||
| 		staff_member_required(views.soustredeniObalkyView), name='seminar_soustredeni_obalky'), | ||||
| 
 | ||||
| 	url('tex-upload/login/', views.LoginView, name='seminar_login'), | ||||
| 	url( | ||||
| 	path('tex-upload/login/', views.LoginView, name='seminar_login'), | ||||
| 	path( | ||||
| 		'tex-upload/', | ||||
| 		staff_member_required(views.texUploadView), | ||||
| 		name='seminar_tex_upload' | ||||
| 	), | ||||
| 	url('prihlaska/',views.get_name), | ||||
| 	path('prihlaska/',views.get_name), | ||||
| 	path('', views.TitulniStranaView.as_view(), name='titulni_strana'), | ||||
| 
 | ||||
| 	# Ceka na autocomplete v3 | ||||
| 	# url('autocomplete/organizatori/', | ||||
| 	# path('autocomplete/organizatori/', | ||||
| 	# staff_member_required(views.OrganizatorAutocomplete.as_view()), | ||||
| 	# name='seminar_autocomplete_organizator') | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
		Reference in a new issue
	
	 Tomáš Domes
						Tomáš Domes