From 90da85e8563298a23e860db08db952f9a6b46f2d Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Wed, 13 May 2009 05:58:58 +0100 Subject: [svn] revert some of the changes (href element) so that the links work Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8267 by julian @ 3/11/2009 10:44 AM --- urls.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'urls.py') diff --git a/urls.py b/urls.py index 42e611d..cb95636 100644 --- a/urls.py +++ b/urls.py @@ -21,7 +21,8 @@ urlpatterns = patterns('', #url(r'^person/(\w+_\w+)$', views_logbooks.person, name="person"), url(r'^expedition/(\d+)$', views_logbooks.expedition, name="expedition"), - url(r'^personexpedition/(?P[A-Z]*[a-z]*)[^a-zA-Z]*(?P[A-Z]*[a-z]*)/(?P\d+)/?$', views_logbooks.personexpedition, name="personexpedition"), + #url(r'^personexpedition/(?P[A-Z]*[a-z]*)[^a-zA-Z]*(?P[A-Z]*[a-z]*)/(?P\d+)/?$', views_logbooks.personexpedition, name="personexpedition"), + url(r'^personexpedition/(.+?)/(\d+)$', views_logbooks.personexpedition, name="personexpedition"), url(r'^logbookentry/(.+)$', views_logbooks.logbookentry,name="logbookentry"), url(r'^survexblock/(.+)$', views_caves.survexblock, name="survexblock"), -- cgit v1.2.3