diff options
Diffstat (limited to 'chimere/models.py')
| -rw-r--r-- | chimere/models.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chimere/models.py b/chimere/models.py index 02eee76..d06e42d 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -312,7 +312,7 @@ class Marker(GeographicItem): @property def multimedia_items(self): pict = list(self.pictures.filter(miniature=False).all()) - mm = list(self.multimedia_files.all()) + mm = list(self.multimedia_files.filter(miniature=False).all()) items = [(item.order, item) for item in pict + mm] return [item for order, item in sorted(items)] @@ -321,6 +321,10 @@ class Marker(GeographicItem): return list(self.pictures.filter(miniature=True)) @property + def default_multimedia_items(self): + return list(self.multimedia_files.filter(miniature=True)) + + @property def date(self): if settings.CHIMERE_DAYS_BEFORE_EVENT: return self.start_date @@ -467,6 +471,8 @@ class MultimediaFile(models.Model): url = models.URLField(_(u"Url"), max_length=200) order = models.IntegerField(_(u"Order"), default=1) multimedia_type = models.ForeignKey(MultimediaType) + miniature = models.BooleanField(_(u"Display inside the description?"), + default=settings.CHIMERE_MINIATURE_BY_DEFAULT) def __unicode__(self): return self.name or u"" @@ -491,7 +497,8 @@ class PictureFile(models.Model): height_field='height', width_field='width') height = models.IntegerField(_(u"Height")) width = models.IntegerField(_(u"Width")) - miniature = models.BooleanField(_(u"Display inside the description?")) + miniature = models.BooleanField(_(u"Display inside the description?"), + default=settings.CHIMERE_MINIATURE_BY_DEFAULT) order = models.IntegerField(_(u"Order"), default=1) def __unicode__(self): |