From 322d30dcb1dbf54162b79c5df08d0b80694845fc Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 5 Sep 2016 20:41:18 +0200 Subject: Fix right checking to view images --- ishtar_common/utils.py | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'ishtar_common/utils.py') diff --git a/ishtar_common/utils.py b/ishtar_common/utils.py index 255cb858e..ad7c6d80f 100644 --- a/ishtar_common/utils.py +++ b/ishtar_common/utils.py @@ -86,13 +86,25 @@ def _get_image_link(item): unicode(_(u"Load another random image?")))) -def get_random_item_image_link(): +def get_random_item_image_link(request): 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(thumbnail__isnull=False).count() - cr_image_nb = ContextRecord.objects.filter(thumbnail__isnull=False).count() - find_image_nb = Find.objects.filter(thumbnail__isnull=False).count() + + ope_image_nb, cr_image_nb, find_image_nb = 0, 0, 0 + if request.user.has_perm('archaeological_operations.view_operation', + Operation): + ope_image_nb = Operation.objects.filter( + thumbnail__isnull=False).count() + if request.user.has_perm( + 'archaeological_context_records.view_contextrecord', + ContextRecord): + cr_image_nb = ContextRecord.objects.filter( + thumbnail__isnull=False).count() + if request.user.has_perm('archaeological_finds.view_find', + Find): + 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: -- cgit v1.2.3