summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Wenham <sam@wenhams.co.uk>2019-02-23 15:43:38 +0000
committerSam Wenham <sam@wenhams.co.uk>2019-02-23 15:43:38 +0000
commit670559ec8722d8f2f5c97e93bbed1f610cc67206 (patch)
treec199fb85d8108db284e8a85129ed3a864676dba2
parent7f92a7280d94e4bf4dfa5507e35ad9ea540bd7bc (diff)
downloadtroggle-670559ec8722d8f2f5c97e93bbed1f610cc67206.tar.gz
troggle-670559ec8722d8f2f5c97e93bbed1f610cc67206.tar.bz2
troggle-670559ec8722d8f2f5c97e93bbed1f610cc67206.zip
Revert urls.py as it contains Django 1.8 upgrade code
-rw-r--r--urls.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/urls.py b/urls.py
index e00dee8..9d8b74f 100644
--- a/urls.py
+++ b/urls.py
@@ -30,7 +30,7 @@ actualurlpatterns = patterns('',
#url(r'^person/(\w+_\w+)$', views_logbooks.person, name="person"),
url(r'^expedition/(\d+)$', views_logbooks.expedition, name="expedition"),
- url(r'^expeditions/?$', views_logbooks.ExpeditionListView.as_view(), name="expeditions"),
+ url(r'^expeditions/?$', ListView, {'queryset':Expedition.objects.all(),'template_name':'object_list.html'},name="expeditions"),
url(r'^personexpedition/(?P<first_name>[A-Z]*[a-z]*)[^a-zA-Z]*(?P<last_name>[A-Z]*[a-z]*)/(?P<year>\d+)/?$', views_logbooks.personexpedition, name="personexpedition"),
url(r'^logbookentry/(?P<date>.*)/(?P<slug>.*)/?$', views_logbooks.logbookentry,name="logbookentry"),
url(r'^newlogbookentry/(?P<expeditionyear>.*)$', views_logbooks.newLogbookEntry, name="newLogBookEntry"),