summaryrefslogtreecommitdiffstats
path: root/urls.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:58:58 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:58:58 +0100
commit90da85e8563298a23e860db08db952f9a6b46f2d (patch)
tree1686e07bdbdcf5468c9fe49d352f02e02221f14a /urls.py
parente8da6b9b8b0d5390d26832af42550c4e651a82dd (diff)
downloadtroggle-90da85e8563298a23e860db08db952f9a6b46f2d.tar.gz
troggle-90da85e8563298a23e860db08db952f9a6b46f2d.tar.bz2
troggle-90da85e8563298a23e860db08db952f9a6b46f2d.zip
[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
Diffstat (limited to 'urls.py')
-rw-r--r--urls.py3
1 files changed, 2 insertions, 1 deletions
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<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'^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'^personexpedition/(.+?)/(\d+)$', views_logbooks.personexpedition, name="personexpedition"),
url(r'^logbookentry/(.+)$', views_logbooks.logbookentry,name="logbookentry"),
url(r'^survexblock/(.+)$', views_caves.survexblock, name="survexblock"),