diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/utils.py | 20 | ||||
| -rw-r--r-- | ishtar_common/views.py | 5 |
2 files changed, 19 insertions, 6 deletions
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: diff --git a/ishtar_common/views.py b/ishtar_common/views.py index ea2eda462..46a8ceb6a 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -80,13 +80,14 @@ def index(request): """ dct = {} profile = get_current_profile() + image = get_random_item_image_link(request) if hasattr(profile, 'homepage') and profile.homepage: dct['homepage'] = markdown(profile.homepage) if '{random_image}' in dct['homepage']: dct['homepage'] = dct['homepage'].replace( - '{random_image}', get_random_item_image_link()) + '{random_image}', image) else: - dct['random_image'] = get_random_item_image_link() + dct['random_image'] = image try: return render_to_response('index.html', dct, context_instance=RequestContext(request)) |