pagination/tests.py tests/runtests.py tests/settings.py @@ -92,14 +92,24 @@ def paginate(context, window=4): first_list = sorted(list(first)) second_list = sorted(list(current)) pages.extend(first_list) - if first_list[-1] + 1 != second_list[0]: + diff = second_list[0] - first_list[-1] + if diff == 2: + pages.append(second_list[0] - 1) + elif diff == 1: + pass + else: pages.append(None) pages.extend(second_list) else: pages.extend(sorted(list(first.union(current)))) if len(current.intersection(last)) == 0: second_list = sorted(list(last)) - if pages[-1] + 1 != second_list[0]: + diff = second_list[0] - pages[-1] + if diff == 2: + pages.append(second_list[0] - 1) + elif diff == 1: + pass + else: pages.append(None) pages.extend(second_list) else: @@ -113,4 +123,4 @@ def paginate(context, window=4): except KeyError: return u'' register.inclusion_tag('pagination/pagination.html', takes_context=True)(paginate) -register.tag('autopaginate', do_autopaginate) +register.tag('autopaginate', do_autopaginate) \ No newline at end of file pagination/templatetags/pagination_tags.py 4d9362dc29cdd664d9b12f8f7a5e7acc0afac531 floguy floguy@7f1efe38-554e-0410-b69d-834cb44da2d5 http://github.com/ericflo/django-pagination/commit/a35ff9bd925bb5fd3ab2e43cae19a62afb2f5701 a35ff9bd925bb5fd3ab2e43cae19a62afb2f5701 2008-05-29T21:35:24-07:00 2008-05-29T21:35:24-07:00 Added test suite, and prevented pagination if the elusion would take up only one space. git-svn-id: https://django-pagination.googlecode.com/svn/trunk@13 7f1efe38-554e-0410-b69d-834cb44da2d5 3b883de936c99b6ee208d7fd68f764d64c2b6de5 floguy floguy@7f1efe38-554e-0410-b69d-834cb44da2d5