From 9b44731c338a14e45b9a6f757cdaec8bf67db77d Mon Sep 17 00:00:00 2001 From: substantialnoninfringinguser Date: Fri, 12 Jun 2009 05:39:30 +0100 Subject: [svn] * Fix bugs that were causing broken wikilinks. *Add edit link to mugshots. *make admin url trailing-slash tolerant --- expo/views_logbooks.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'expo/views_logbooks.py') diff --git a/expo/views_logbooks.py b/expo/views_logbooks.py index cfebd35..afcdafc 100644 --- a/expo/views_logbooks.py +++ b/expo/views_logbooks.py @@ -98,9 +98,13 @@ def newQMlink(logbookentry): return settings.URL_ROOT + r'/admin/expo/qm/add/?' + r'found_by=' + str(logbookentry.pk) +'&number=' + str(nextQMnumber) def logbookentry(request, date, slug): - logbookentry = LogbookEntry.objects.get(date=date, slug=slug) - - return render_response(request, 'logbookentry.html', {'logbookentry': logbookentry, 'newQMlink':newQMlink(logbookentry)}) + logbookentry = LogbookEntry.objects.filter(date=date, slug=slug) + + if len(logbookentry)>1: + return render_response(request, 'object_list.html',{'object_list':logbookentry}) + else: + logbookentry=logbookentry[0] + return render_response(request, 'logbookentry.html', {'logbookentry': logbookentry, 'newQMlink':newQMlink(logbookentry)}) def logbookSearch(request, extra): query_string = '' -- cgit v1.2.3