Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8157 by aaron @ 1/16/2009 2:19 AM
This commit is contained in:
substantialnoninfringinguser
2009-05-13 05:29:31 +01:00
parent 93cd18e40d
commit f3db37711f
2 changed files with 11 additions and 12 deletions

View File

@@ -309,8 +309,8 @@ def get_scan_path(instance, filename):
class ScannedImage(models.Model):
file = models.ImageField(storage=scansFileStorage, upload_to=get_scan_path)
scannedBy = models.ForeignKey(Person,blank=True, null=True)
scannedOn = models.DateField(null=True)
scanned_by = models.ForeignKey(Person,blank=True, null=True)
scanned_on = models.DateField(null=True)
survey = models.ForeignKey('Survey')
contents = models.CharField(max_length=20,choices=(('notes','notes'),('plan','plan_sketch'),('elevation','elevation_sketch')))
number_in_wallet = models.IntegerField(null=True)
@@ -326,9 +326,6 @@ class ScannedImage(models.Model):
def __str__(self):
return get_scan_path(self,'')
class admin():
pass
class Survey(models.Model):
expedition_year = models.ForeignKey('Expedition')