From 0f5109cb0988d76c5b7d3037acca0ad8ac07f0dd Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Wed, 13 May 2009 05:38:18 +0100 Subject: [svn] new person expedition Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8189 by julian @ 1/18/2009 7:50 PM --- expo/views_logbooks.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) (limited to 'expo/views_logbooks.py') diff --git a/expo/views_logbooks.py b/expo/views_logbooks.py index 1f3de23..935eebd 100644 --- a/expo/views_logbooks.py +++ b/expo/views_logbooks.py @@ -22,17 +22,19 @@ def expedition(request, expeditionname): return render_to_response('expedition.html', {'expedition': expedition, 'expedition_next':expedition_next, 'expedition_prev':expedition_prev, 'logbookentries':logbookentries, 'message':message, 'settings': settings}) def person(request, name): - persons = Person.objects.all() - for person in persons: - if person.href() == name: - break - person = None + person = Person.objects.get(href=name) return render_to_response('person.html', {'person': person, 'settings': settings}) +def personexpedition(request, name, expeditionname): + person = Person.objects.get(href=name) + year = int(expeditionname) + expedition = Expedition.objects.get(year=year) + personexpedition = person.personexpedition_set.get(expedition=expedition) + return render_to_response('personexpedition.html', {'personexpedition': personexpedition, 'settings': settings}) + + def logbookentry(request, logbookentry_id): - logbookentry = LogbookEntry.objects.filter(id = logbookentry_id)[0] - - + logbookentry = LogbookEntry.objects.filter(href = logbookentry_id)[0] return render_to_response('logbookentry.html', {'logbookentry': logbookentry, 'settings': settings}) -- cgit v1.2.3