summaryrefslogtreecommitdiff
path: root/ishtar_common/utils.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-05 20:30:18 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-09-05 20:30:18 +0200
commitcd7e945225c8c9ec040d68f1401728b6fe0b6df7 (patch)
tree7fd35d6490af0744ff265c2f6b4bd27141ccc36d /ishtar_common/utils.py
parentedfe798c15c8589933cb41314d01ff73a8d7c0c8 (diff)
downloadIshtar-cd7e945225c8c9ec040d68f1401728b6fe0b6df7.tar.bz2
Ishtar-cd7e945225c8c9ec040d68f1401728b6fe0b6df7.zip
Random image: check for thumbnails not for images
Diffstat (limited to 'ishtar_common/utils.py')
-rw-r--r--ishtar_common/utils.py12
1 files changed, 6 insertions, 6 deletions
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 ''