summaryrefslogtreecommitdiffstats
path: root/expo/models.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:29:31 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:29:31 +0100
commitf3db37711f27704b8f09e2f577d79284f48ec57e (patch)
tree55723db63ef84c81cf1a210f278887ba092cd2c8 /expo/models.py
parent93cd18e40d243faaf2263c021d06b2edfd89a352 (diff)
downloadtroggle-f3db37711f27704b8f09e2f577d79284f48ec57e.tar.gz
troggle-f3db37711f27704b8f09e2f577d79284f48ec57e.tar.bz2
troggle-f3db37711f27704b8f09e2f577d79284f48ec57e.zip
[svn]
Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8157 by aaron @ 1/16/2009 2:19 AM
Diffstat (limited to 'expo/models.py')
-rw-r--r--expo/models.py7
1 files changed, 2 insertions, 5 deletions
diff --git a/expo/models.py b/expo/models.py
index e5eb87c..88201e2 100644
--- a/expo/models.py
+++ b/expo/models.py
@@ -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')