From: yomguy Date: Fri, 6 May 2011 12:33:58 +0000 (+0200) Subject: fix no criteria for search results X-Git-Tag: 1.1~236 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=1445b2334410484bd6000aea7c79e72206eb6754;p=telemeta.git fix no criteria for search results --- diff --git a/telemeta/htdocs/images/search_red.png b/telemeta/htdocs/images/search_red.png index d9545e0a..54ab50c3 100644 Binary files a/telemeta/htdocs/images/search_red.png and b/telemeta/htdocs/images/search_red.png differ diff --git a/telemeta/templatetags/paginator.py b/telemeta/templatetags/paginator.py index 1db6e8c6..42e63526 100644 --- a/telemeta/templatetags/paginator.py +++ b/telemeta/templatetags/paginator.py @@ -22,7 +22,11 @@ def paginator(context, adjacent_pages=2): if n > 0 and n <= context['pages']] page_obj = context['page_obj'] paginator = context['paginator'] - + if context.has_key('criteria'): + criteria = context['criteria'] + else: + criteria ='' + return { 'page_obj': page_obj, 'paginator': paginator, @@ -37,7 +41,7 @@ def paginator(context, adjacent_pages=2): 'has_previous': context['has_previous'], 'show_first': 1 not in page_numbers, 'show_last': context['pages'] not in page_numbers, - 'criteria' : context['criteria'], + 'criteria' : criteria, } register.inclusion_tag('telemeta/paginator.html', takes_context=True)(paginator)