diff options
| -rw-r--r-- | chimere/models.py | 9 | ||||
| -rw-r--r-- | chimere/templatetags/chimere_tags.py | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/chimere/models.py b/chimere/models.py index eced32e..d4f5ef2 100644 --- a/chimere/models.py +++ b/chimere/models.py @@ -314,11 +314,12 @@ class Marker(GeographicItem): @property def default_pictures(self): - return list(self.pictures.filter(miniature=True)) + return list(self.pictures.filter(miniature=True).order_by('order')) @property def default_multimedia_items(self): - return list(self.multimedia_files.filter(miniature=True)) + return list(self.multimedia_files.filter(miniature=True + ).order_by('order')) @property def date(self): @@ -497,7 +498,7 @@ def multimediafile_post_save(sender, **kwargs): for idx, mf in enumerate(mfs.all()): mf.order = idx + 1 mf.save() - multimediafile.order = mfs.count() + 2 + multimediafile.order = mfs.count() + 1 multimediafile.save() post_save.connect(multimediafile_post_save, sender=MultimediaFile) @@ -525,7 +526,7 @@ def picturefile_post_save(sender, **kwargs): for idx, pf in enumerate(pfs.all()): pf.order = idx + 1 pf.save() - picturefile.order = idx + 2 + picturefile.order = pfs.count() + 1 picturefile.save() post_save.connect(picturefile_post_save, sender=PictureFile) diff --git a/chimere/templatetags/chimere_tags.py b/chimere/templatetags/chimere_tags.py index a0ce607..e2f7cc9 100644 --- a/chimere/templatetags/chimere_tags.py +++ b/chimere/templatetags/chimere_tags.py @@ -118,7 +118,7 @@ def map_params(context): @register.inclusion_tag('chimere/blocks/multimedia_file.html', takes_context=True) def multimedia_render(context, multimedia_file): - context['multimedia_file'] = multimedia_file + context['multimedia_item'] = multimedia_file return context |