Merge branch 'master' of atrey:/akce/MaM/MaMweb/mamweb
* 'master' of atrey:/akce/MaM/MaMweb/mamweb: Oprava url pro tvoreni odkazu na cisla, aby to fungovalo pro cislo 7-8. Anet
This commit is contained in:
commit
39f520260d
1 changed files with 1 additions and 1 deletions
|
@ -8,7 +8,7 @@ urlpatterns = patterns('',
|
||||||
url(r'^archiv/cisla/$', views.CislaView.as_view()),
|
url(r'^archiv/cisla/$', views.CislaView.as_view()),
|
||||||
|
|
||||||
url(r'^rocnik/(?P<rocnik>\d+)/$', views.RocnikView.as_view(), name='seminar_rocnik'),
|
url(r'^rocnik/(?P<rocnik>\d+)/$', views.RocnikView.as_view(), name='seminar_rocnik'),
|
||||||
url(r'^cislo/(?P<rocnik>\d+)\.(?P<cislo>\d+)/$', views.CisloView.as_view(), name='seminar_cislo'),
|
url(r'^cislo/(?P<rocnik>\d+)\.(?P<cislo>[0-9-]+)/$', views.CisloView.as_view(), name='seminar_cislo'),
|
||||||
url(r'^problem/(?P<pk>\d+)/$', views.ProblemView.as_view(), name='seminar_problem'),
|
url(r'^problem/(?P<pk>\d+)/$', views.ProblemView.as_view(), name='seminar_problem'),
|
||||||
|
|
||||||
url(r'^soustredeni/$', views.SoustredeniListView.as_view(),
|
url(r'^soustredeni/$', views.SoustredeniListView.as_view(),
|
||||||
|
|
Loading…
Reference in a new issue