expo/expoweb
1
0
Fork 0
mirror of https://expo.survex.com/repositories/expoweb/.git/ synced 2024-11-23 07:41:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

[svn r8307] Up to late programming last night and forgot that not all logbookentries will have caves attached. The function I wrote for making the "add a qm link" was breaking stuff.

Browse Source 
Fixed now.
This commit is contained in:
aaron 2009-03-16 19:09:26 +01:00
parent 5c84cc7674
commit 6f62771552
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
troggle/expo/views_logbooks.py
View File

@ -69,20 +69,28 @@ def personexpedition(request, first_name='', last_name='', year=''):
personexpedition = person.personexpedition_set.get(expedition=expedition) personexpedition = person.personexpedition_set.get(expedition=expedition)
return render_response(request,'personexpedition.html', {'personexpedition': personexpedition, }) return render_response(request,'personexpedition.html', {'personexpedition': personexpedition, })
def logbookentry(request, logbookentry_pk): def newQMlink(logbookentry):
logbookentry = LogbookEntry.objects.get(pk = logbookentry_pk)
logsforcave=logbookentry.cave.logbookentry_set.all()
biggestQMnumber=0 biggestQMnumber=0
for log in logsforcave: if logbookentry.cave:
try: for log in logbookentry.cave.logbookentry_set.all():
try:
biggestQMnumberInLog = logbookentry.QMs_found.order_by('-number')[0].number biggestQMnumberInLog = logbookentry.QMs_found.order_by('-number')[0].number
except IndexError: except IndexError:
biggestQMnumberInLog = 0 biggestQMnumberInLog = 0
if biggestQMnumberInLog > biggestQMnumber: if biggestQMnumberInLog > biggestQMnumber:
biggestQMnumber = biggestQMnumberInLog biggestQMnumber = biggestQMnumberInLog
else:
return None
nextQMnumber=biggestQMnumber+1 nextQMnumber=biggestQMnumber+1
newQMlink=settings.URL_ROOT + r'/admin/expo/qm/add/?' + r'found_by=' + str(logbookentry.pk) +'&number=' + str(nextQMnumber) return settings.URL_ROOT + r'/admin/expo/qm/add/?' + r'found_by=' + str(logbookentry.pk) +'&number=' + str(nextQMnumber)
return render_response(request, 'logbookentry.html', {'logbookentry': logbookentry, 'newQMlink':newQMlink})
def logbookentry(request, logbookentry_pk):
logbookentry = LogbookEntry.objects.get(pk = logbookentry_pk)
return render_response(request, 'logbookentry.html', {'logbookentry': logbookentry, 'newQMlink':newQMlink(logbookentry)})
def logbookSearch(request, extra): def logbookSearch(request, extra):
query_string = '' query_string = ''