diff options
Diffstat (limited to 'urls.py')
| -rw-r--r-- | urls.py | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -1,4 +1,4 @@ -from django.conf.urls.defaults import * +from django.conf.urls import * from django.conf import settings from core.views import * # flat import @@ -6,9 +6,9 @@ from core.views_other import * from core.views_caves import * from core.views_survex import * from core.models import * -from django.views.generic.create_update import create_object +from django.views.generic.edit import UpdateView from django.contrib import admin -from django.views.generic.list_detail import object_list +from django.views.generic.list import ListView from django.contrib import admin admin.autodiscover() @@ -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/?$', object_list, {'queryset':Expedition.objects.all(),'template_name':'object_list.html'},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"), @@ -96,7 +96,7 @@ actualurlpatterns = patterns('', url(r'^troggle/media-admin/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ADMIN_DIR, 'show_indexes':True}), - (r'^accounts/', include('registration.urls')), + (r'^accounts/', include('registration.backends.default.urls')), (r'^profiles/', include('profiles.urls')), |