diff options
| author | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:39:52 +0100 |
|---|---|---|
| committer | substantialnoninfringinguser <substantialnoninfringinguser@gmail.com> | 2009-05-13 05:39:52 +0100 |
| commit | 0ba4dd4ef47eeeb8ef38b4c30b6d39649c56342a (patch) | |
| tree | 7a806015bda042e5d13d55e6d52a37924fb4e11e /expo/views_logbooks.py | |
| parent | 39ab4d25147a8e115fc4f6f05c8246dbe51c3ca0 (diff) | |
| download | troggle-0ba4dd4ef47eeeb8ef38b4c30b6d39649c56342a.tar.gz troggle-0ba4dd4ef47eeeb8ef38b4c30b6d39649c56342a.tar.bz2 troggle-0ba4dd4ef47eeeb8ef38b4c30b6d39649c56342a.zip | |
[svn] survey block object
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8199 by julian @ 1/19/2009 12:22 AM
Diffstat (limited to 'expo/views_logbooks.py')
| -rw-r--r-- | expo/views_logbooks.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/expo/views_logbooks.py b/expo/views_logbooks.py index 935eebd..7d18ba1 100644 --- a/expo/views_logbooks.py +++ b/expo/views_logbooks.py @@ -1,7 +1,10 @@ from django.shortcuts import render_to_response
from troggle.expo.models import Expedition, Person, PersonExpedition, PersonTrip, LogbookEntry
import troggle.settings as settings
+
from troggle.parsers.logbooks import LoadLogbookForExpedition
+from troggle.parsers.people import GetPersonExpeditionNameLookup
+
import search
import re
@@ -17,7 +20,7 @@ def expedition(request, expeditionname): message = "No message"
if "reload" in request.GET:
message = LoadLogbookForExpedition(expedition)
-
+ #message = str(GetPersonExpeditionNameLookup(expedition).keys())
logbookentries = expedition.logbookentry_set.order_by('date')
return render_to_response('expedition.html', {'expedition': expedition, 'expedition_next':expedition_next, 'expedition_prev':expedition_prev, 'logbookentries':logbookentries, 'message':message, 'settings': settings})
|