[svn] long putting in

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8065 by julian @ 11/7/2008 2:08 AM
This commit is contained in:
substantialnoninfringinguser
2009-05-13 05:19:07 +01:00
parent b33061a3ce
commit a8ad3a3b1e
3 changed files with 39 additions and 57 deletions

View File

@@ -16,6 +16,7 @@ class Expedition(models.Model):
res = None
for personexpedition in personexpeditions:
for possiblenameform in personexpedition.GetPossibleNameForms():
#print "nnn", possiblenameform
if name == possiblenameform:
assert not res, "Ambiguous: " + name
res = personexpedition
@@ -55,7 +56,7 @@ class PersonExpedition(models.Model):
class LogbookEntry(models.Model):
date = models.DateField()
author = models.ForeignKey(PersonExpedition,blank=True,null=True) # the person who writes it up doesn't have to have been on the trip
title = models.CharField(max_length=100)
title = models.CharField(max_length=200)
# this will be a foreign key of the place the logbook is describing
place = models.CharField(max_length=100,blank=True,null=True)