From 20ddc8d20f94d2381447c29f204f5b48841b6980 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Tue, 27 Feb 2018 15:09:52 +0100 Subject: Exclude empty image from random image (refs #3737) --- ishtar_common/utils.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'ishtar_common') diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 0fd540bb9..8524b6bca 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -173,7 +173,8 @@ def disable_for_loaddata(signal_handler): def _get_image_link(item): # manage missing images - if not item.thumbnail or not item.thumbnail.url: + if not item.thumbnail or not item.thumbnail.url or not item.image \ + or not item.image.url: return "" return mark_safe(u"""
@@ -214,11 +215,14 @@ def get_random_item_image_link(request): ope_image_nb, cr_image_nb, find_image_nb = 0, 0, 0 q_ope = Operation.objects.filter( - thumbnail__isnull=False).exclude(thumbnail='') + thumbnail__isnull=False, image__isnull=False + ).exclude(thumbnail='').exclude(image='') q_cr = ContextRecord.objects.filter( - thumbnail__isnull=False).exclude(thumbnail='') + thumbnail__isnull=False, image__isnull=False + ).exclude(thumbnail='').exclude(image='') q_find = Find.objects.filter( - thumbnail__isnull=False).exclude(thumbnail='') + thumbnail__isnull=False, image__isnull=False + ).exclude(thumbnail='').exclude(image='') if request.user.has_perm('archaeological_operations.view_operation', Operation): ope_image_nb = q_ope.count() -- cgit v1.2.3