diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-27 15:09:52 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-02-27 15:09:52 +0100 |
| commit | edd797da439da455d94a5cf3908a25e220faf73e (patch) | |
| tree | e8c984867b70247cfe270e471c53a1e7b36f35f0 | |
| parent | 704d892fba66173b2a0fd70b75ba7ac0e55e5b49 (diff) | |
| download | Ishtar-edd797da439da455d94a5cf3908a25e220faf73e.tar.bz2 Ishtar-edd797da439da455d94a5cf3908a25e220faf73e.zip | |
Exclude empty image from random image (refs #3737)
| -rw-r--r-- | ishtar_common/utils.py | 12 |
1 files changed, 8 insertions, 4 deletions
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""" <div class="col col-lg-3"> @@ -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() |