Permalink
Browse files

Merge remote branch 'carljm/hashtag'

Conflicts:
	pagination/templatetags/pagination_tags.py
  • Loading branch information...
2 parents cbdc3bd + 1d3f1e0 commit 947647e585b7621a41b8a5d1e72f9d6924cf6750 @brosner brosner committed Apr 16, 2010
Showing with 4 additions and 3 deletions.
  1. +2 −2 pagination/templates/pagination/pagination.html
  2. +2 −1 pagination/templatetags/pagination_tags.py
@@ -2,7 +2,7 @@
{% load i18n %}
<div class="pagination">
{% if page_obj.has_previous %}
- <a href="?page={{ page_obj.previous_page_number }}{{ getvars }}" class="prev">&lsaquo;&lsaquo; {% trans "previous" %}</a>
+ <a href="?page={{ page_obj.previous_page_number }}{{ getvars }}{{ hashtag }}" class="prev">&lsaquo;&lsaquo; {% trans "previous" %}</a>
{% else %}
<span class="disabled prev">&lsaquo;&lsaquo; {% trans "previous" %}</span>
{% endif %}
@@ -18,7 +18,7 @@
{% endif %}
{% endfor %}
{% if page_obj.has_next %}
- <a href="?page={{ page_obj.next_page_number }}{{ getvars }}" class="next">{% trans "next" %} &rsaquo;&rsaquo;</a>
+ <a href="?page={{ page_obj.next_page_number }}{{ getvars }}{{ hashtag }}" class="next">{% trans "next" %} &rsaquo;&rsaquo;</a>
{% else %}
<span class="disabled next">{% trans "next" %} &rsaquo;&rsaquo;</span>
{% endif %}
@@ -104,7 +104,8 @@ def render(self, context):
context['page_obj'] = page_obj
return u''
-def paginate(context, window=DEFAULT_WINDOW, hashtag=None):
+
+def paginate(context, window=DEFAULT_WINDOW, hashtag=''):
"""
Renders the ``pagination/pagination.html`` template, resulting in a
Digg-like display of the available pages, given the current page. If there

1 comment on commit 947647e

Owner

ericflo commented on 947647e Apr 16, 2010

Man, I was trying to merge this and it took me a good half hour to figure out that you had already done so brosner :) Thanks for doing so, though. Fixes a pretty major bug in the latest release.

Please sign in to comment.