Skip to content
This repository
Browse code

Merge remote branch 'carljm/hashtag'

Conflicts:
	pagination/templatetags/pagination_tags.py
  • Loading branch information...
commit 947647e585b7621a41b8a5d1e72f9d6924cf6750 2 parents cbdc3bd + 1d3f1e0
Brian Rosner authored April 16, 2010
4  pagination/templates/pagination/pagination.html
@@ -2,7 +2,7 @@
2 2
 {% load i18n %}
3 3
 <div class="pagination">
4 4
     {% if page_obj.has_previous %}
5  
-        <a href="?page={{ page_obj.previous_page_number }}{{ getvars }}" class="prev">&lsaquo;&lsaquo; {% trans "previous" %}</a>
  5
+        <a href="?page={{ page_obj.previous_page_number }}{{ getvars }}{{ hashtag }}" class="prev">&lsaquo;&lsaquo; {% trans "previous" %}</a>
6 6
     {% else %}
7 7
         <span class="disabled prev">&lsaquo;&lsaquo; {% trans "previous" %}</span>
8 8
     {% endif %}
@@ -18,7 +18,7 @@
18 18
         {% endif %}
19 19
     {% endfor %}
20 20
     {% if page_obj.has_next %}
21  
-        <a href="?page={{ page_obj.next_page_number }}{{ getvars }}" class="next">{% trans "next" %} &rsaquo;&rsaquo;</a>
  21
+        <a href="?page={{ page_obj.next_page_number }}{{ getvars }}{{ hashtag }}" class="next">{% trans "next" %} &rsaquo;&rsaquo;</a>
22 22
     {% else %}
23 23
         <span class="disabled next">{% trans "next" %} &rsaquo;&rsaquo;</span>
24 24
     {% endif %}
3  pagination/templatetags/pagination_tags.py
@@ -104,7 +104,8 @@ def render(self, context):
104 104
         context['page_obj'] = page_obj
105 105
         return u''
106 106
 
107  
-def paginate(context, window=DEFAULT_WINDOW, hashtag=None):
  107
+
  108
+def paginate(context, window=DEFAULT_WINDOW, hashtag=''):
108 109
     """
109 110
     Renders the ``pagination/pagination.html`` template, resulting in a
110 111
     Digg-like display of the available pages, given the current page.  If there

1 note on commit 947647e

Eric Florenzano
Owner

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.
Something went wrong with that request. Please try again.