From cd7e945225c8c9ec040d68f1401728b6fe0b6df7 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 5 Sep 2016 20:30:18 +0200 Subject: Random image: check for thumbnails not for images --- ishtar_common/utils.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'ishtar_common/utils.py') diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index cb45d32e1..255cb858e 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -90,9 +90,9 @@ def get_random_item_image_link(): from archaeological_operations.models import Operation from archaeological_context_records.models import ContextRecord from archaeological_finds.models import Find - ope_image_nb = Operation.objects.filter(image__isnull=False).count() - cr_image_nb = ContextRecord.objects.filter(image__isnull=False).count() - find_image_nb = Find.objects.filter(image__isnull=False).count() + ope_image_nb = Operation.objects.filter(thumbnail__isnull=False).count() + cr_image_nb = ContextRecord.objects.filter(thumbnail__isnull=False).count() + find_image_nb = Find.objects.filter(thumbnail__isnull=False).count() image_total = ope_image_nb + cr_image_nb + find_image_nb if not image_total: @@ -101,14 +101,14 @@ def get_random_item_image_link(): image_nb = random.randint(0, image_total - 1) if image_nb >= 0 and image_nb < ope_image_nb: return _get_image_link( - Operation.objects.filter(image__isnull=False).all()[image_nb]) + Operation.objects.filter(thumbnail__isnull=False).all()[image_nb]) if image_nb >= ope_image_nb and image_nb < (cr_image_nb + ope_image_nb): return _get_image_link( - ContextRecord.objects.filter(image__isnull=False).all()[ + ContextRecord.objects.filter(thumbnail__isnull=False).all()[ image_nb - ope_image_nb]) if image_nb >= (cr_image_nb + ope_image_nb): return _get_image_link( - Find.objects.filter(image__isnull=False).all()[ + Find.objects.filter(thumbnail__isnull=False).all()[ image_nb - ope_image_nb - cr_image_nb]) # should never happen except in case of deletion during the excution return '' -- cgit v1.2.3