Commit 6ef7c2b7 authored by Joost Rijneveld's avatar Joost Rijneveld
Browse files

Merge branch 'fix/int_of_str' into 'master'

Fix regexes of urls in documents app

See merge request !408
parents 373a5467 34ca924b
......@@ -5,18 +5,18 @@ from . import views
app_name = "documents"
urlpatterns = [
url('^miscellaneous/(?P<pk>[0-9]*)', views.get_miscellaneous_document,
url(r'^miscellaneous/(?P<pk>[0-9]+)/$', views.get_miscellaneous_document,
name='miscellaneous-document'),
url('^(?P<document_type>(policy-document|annual-report|financial-report))/'
'(?P<year>[0-9]{4})',
url(r'^(?P<document_type>(policy-document|annual-report|financial-report))/'
r'(?P<year>[0-9]{4})/$',
views.get_association_document,
name='association-document'),
url('^general-meeting/(?P<pk>[0-9]*)/', include([
url('^minutes', views.get_general_meeting_minutes,
url(r'^general-meeting/(?P<pk>[0-9]+)/', include([
url(r'^minutes/$', views.get_general_meeting_minutes,
name='minutes'),
# TODO can we make this URL more pretty, using e.g. document seq nrs?
url('^(?P<document_pk>[0-9]*)', views.get_general_meeting_document,
url(r'^(?P<document_pk>[0-9]+)/$', views.get_general_meeting_document,
name='general-meeting-document'),
])),
url('^', views.index, name='index'),
url(r'^$', views.index, name='index'),
]
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment