fnp
/
fnpdjango.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make prevnext respect get pars
[fnpdjango.git]
/
fnpdjango
/
templatetags
/
fnp_prevnext.py
diff --git
a/fnpdjango/templatetags/fnp_prevnext.py
b/fnpdjango/templatetags/fnp_prevnext.py
index
4cfbb08
..
294cd12
100644
(file)
--- a/
fnpdjango/templatetags/fnp_prevnext.py
+++ b/
fnpdjango/templatetags/fnp_prevnext.py
@@
-1,3
+1,5
@@
+from copy import copy
+from urllib import urlencode
from django.template import Library
register = Library()
from django.template import Library
register = Library()
@@
-7,7
+9,11
@@
register = Library()
def previous_page(context, fallback=None, fallback_title=None):
current = context['page_obj'].number
if current > 1:
def previous_page(context, fallback=None, fallback_title=None):
current = context['page_obj'].number
if current > 1:
- return {'number': current - 1, 'title': None, 'url': None}
+ get_dict = copy(context['request'].GET)
+ get_dict['page'] = current - 1
+ print get_dict
+ return {'number': current - 1, 'title': None, 'url': None,
+ 'get_dict': urlencode(get_dict)}
else:
return {'number': None, 'title': fallback_title, 'url': fallback}
else:
return {'number': None, 'title': fallback_title, 'url': fallback}
@@
-17,7
+23,11
@@
def next_page(context, fallback=None, fallback_title=None):
current = context['page_obj'].number
page_range = context['paginator'].page_range
if current < page_range[-1]:
current = context['page_obj'].number
page_range = context['paginator'].page_range
if current < page_range[-1]:
- return {'number': current + 1, 'title': None, 'url': None}
+ get_dict = copy(context['request'].GET)
+ get_dict['page'] = current + 1
+ print get_dict
+ return {'number': current + 1, 'title': None, 'url': None,
+ 'get_dict': urlencode(get_dict)}
else:
return {'number': None, 'title': fallback_title, 'url': fallback}
else:
return {'number': None, 'title': fallback_title, 'url': fallback}