Upgrade to django 1.5, some functions have been changed

url in templates now requires quotes roung the first arg
USE_TZ added
This commit is contained in:
Sam Wenham
2018-04-11 22:02:57 +01:00
parent 242cf4741a
commit ffb5d7bdda
34 changed files with 104 additions and 103 deletions

View File

@@ -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"),