diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-04-19 21:05:30 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2012-04-19 21:05:30 +0200 |
| commit | 3a19d84d3e197a12239a597a7d771383111ce211 (patch) | |
| tree | 754d3912f213c73a9a9bae448596f1ac917f914f /chimere/models.py | |
| parent | 5a288ffd137ab2167479e995b173edfd6e6d235c (diff) | |
| download | Chimère-3a19d84d3e197a12239a597a7d771383111ce211.tar.bz2 Chimère-3a19d84d3e197a12239a597a7d771383111ce211.zip | |
Fix multimedia and picture submissions for new multimedia files
Diffstat (limited to 'chimere/models.py')
| -rw-r--r-- | chimere/models.py | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/chimere/models.py b/chimere/models.py index 295de1c..b9e9fb4 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -289,11 +289,6 @@ class Marker(GeographicItem): null=True) route = models.ForeignKey(u"Route", blank=True, null=True, related_name='associated_marker') - #pictures = models.ManyToManyField(u"PictureFile", verbose_name='Pictures', - # blank=True, null=True, related_name='marker') - #multimedia_files = models.ManyToManyField(u"MultimediaFile", - # verbose_name='Multimedia files', blank=True, null=True, - # related_name='marker')#, edit_inline=models.STACKED) description = models.TextField(_(u"Description"), blank=True, null=True) objects = BaseGeoManager() @@ -474,7 +469,7 @@ class MultimediaFile(models.Model): multimedia_type = models.ForeignKey(MultimediaType) miniature = models.BooleanField(_(u"Display inside the description?"), default=settings.CHIMERE_MINIATURE_BY_DEFAULT) - marker = models.ForeignKey(Marker) + marker = models.ForeignKey(Marker, related_name='multimedia_files') def __unicode__(self): return self.name or u"" @@ -502,7 +497,7 @@ class PictureFile(models.Model): miniature = models.BooleanField(_(u"Display inside the description?"), default=settings.CHIMERE_MINIATURE_BY_DEFAULT) order = models.IntegerField(_(u"Order"), default=1) - marker = models.ForeignKey(Marker) + marker = models.ForeignKey(Marker, related_name='pictures') def __unicode__(self): return self.name or u"" |
