summaryrefslogtreecommitdiffstats
path: root/expo/models.py
diff options
context:
space:
mode:
authorsubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:53:37 +0100
committersubstantialnoninfringinguser <substantialnoninfringinguser@gmail.com>2009-05-13 05:53:37 +0100
commit24dc7c5a0c996945a0709f8e82b026914ee9dbfc (patch)
treeac79aeb4556ad5ab72bdcfa97ec8dbfb35240dab /expo/models.py
parent25b695e53dd09415f7849b35cd7bc63ca0b2439b (diff)
downloadtroggle-24dc7c5a0c996945a0709f8e82b026914ee9dbfc.tar.gz
troggle-24dc7c5a0c996945a0709f8e82b026914ee9dbfc.tar.bz2
troggle-24dc7c5a0c996945a0709f8e82b026914ee9dbfc.zip
[svn] Photo file handling and mugshots parsing sorted.
Made URL settings more relative, less redundant. Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8246 by aaron @ 2/18/2009 6:45 AM
Diffstat (limited to 'expo/models.py')
-rw-r--r--expo/models.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/expo/models.py b/expo/models.py
index 9561963..faa4ce3 100644
--- a/expo/models.py
+++ b/expo/models.py
@@ -451,12 +451,13 @@ class QM(models.Model):
def __str__(self):
QMnumber=str(self.found_by.cave)+'-'+str(self.found_by.date.year)+"-"+str(self.number)+self.grade
return str(QMnumber)
-
+
+photoFileStorage = FileSystemStorage(location=settings.EXPOWEB+'photos', base_url=settings.PHOTOS_URL)
class Photo(models.Model):
caption = models.CharField(max_length=1000,blank=True,null=True)
contains_person_trip = models.ManyToManyField(PersonTrip,blank=True,null=True)
contains_person = models.ManyToManyField(Person,blank=True,null=True)
- file = models.ImageField(upload_to='photos',)
+ file = models.ImageField(storage=photoFileStorage, upload_to='.',)
is_mugshot = models.BooleanField(default=False)
contains_cave = models.ForeignKey(Cave,blank=True,null=True)
contains_entrance = models.ForeignKey(Entrance, related_name="photo_file",blank=True,null=True)