diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-04-26 05:39:02 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-04-26 05:39:02 -0400 |
| commit | 2ce7b2d3a2313b5be3e765dd7507d14d0062f1c8 (patch) | |
| tree | 016eef57cec7d87247aed1207fe87277563b800b /askbot/views | |
| parent | e3640e5dde07a736d50f3712c8874c90a87cb50a (diff) | |
| download | askbot-2ce7b2d3a2313b5be3e765dd7507d14d0062f1c8.tar.gz askbot-2ce7b2d3a2313b5be3e765dd7507d14d0062f1c8.tar.bz2 askbot-2ce7b2d3a2313b5be3e765dd7507d14d0062f1c8.zip | |
seems to work on django 1.5
Diffstat (limited to 'askbot/views')
| -rw-r--r-- | askbot/views/meta.py | 7 | ||||
| -rw-r--r-- | askbot/views/readers.py | 23 | ||||
| -rw-r--r-- | askbot/views/users.py | 7 |
3 files changed, 10 insertions, 27 deletions
diff --git a/askbot/views/meta.py b/askbot/views/meta.py index 6714f61e..692216da 100644 --- a/askbot/views/meta.py +++ b/askbot/views/meta.py @@ -203,11 +203,8 @@ def list_suggested_tags(request): paginator_context = functions.setup_paginator({ 'is_paginated' : True, 'pages': paginator.num_pages, - 'page': page_no, - 'has_previous': page.has_previous(), - 'has_next': page.has_next(), - 'previous': page.previous_page_number(), - 'next': page.next_page_number(), + 'current_page_number': page_no, + 'page_object': page, 'base_url' : request.path }) diff --git a/askbot/views/readers.py b/askbot/views/readers.py index 1f19c1e6..f738da25 100644 --- a/askbot/views/readers.py +++ b/askbot/views/readers.py @@ -115,14 +115,9 @@ def questions(request, **kwargs): paginator_context = { 'is_paginated' : (paginator.count > page_size), - 'pages': paginator.num_pages, - 'page': search_state.page, - 'has_previous': page.has_previous(), - 'has_next': page.has_next(), - 'previous': page.previous_page_number(), - 'next': page.next_page_number(), - + 'current_page_number': search_state.page, + 'page_object': page, 'base_url' : search_state.query_string(), 'page_size' : page_size, } @@ -297,11 +292,8 @@ def tags(request):#view showing a listing of available tags - plain list paginator_data = { 'is_paginated' : (objects_list.num_pages > 1), 'pages': objects_list.num_pages, - 'page': page, - 'has_previous': tags.has_previous(), - 'has_next': tags.has_next(), - 'previous': tags.previous_page_number(), - 'next': tags.next_page_number(), + 'current_page_number': page, + 'page_object': tags, 'base_url' : reverse('tags') + '?sort=%s&' % sortby } paginator_context = functions.setup_paginator(paginator_data) @@ -524,11 +516,8 @@ def question(request, id):#refactor - long subroutine. display question body, an paginator_data = { 'is_paginated' : (objects_list.count > const.ANSWERS_PAGE_SIZE), 'pages': objects_list.num_pages, - 'page': show_page, - 'has_previous': page_objects.has_previous(), - 'has_next': page_objects.has_next(), - 'previous': page_objects.previous_page_number(), - 'next': page_objects.next_page_number(), + 'current_page_number': show_page, + 'page_object': page_objects, 'base_url' : request.path + '?sort=%s&' % answer_sort_method, } paginator_context = functions.setup_paginator(paginator_data) diff --git a/askbot/views/users.py b/askbot/views/users.py index 0842074a..179392d2 100644 --- a/askbot/views/users.py +++ b/askbot/views/users.py @@ -163,11 +163,8 @@ def show_users(request, by_group=False, group_id=None, group_slug=None): paginator_data = { 'is_paginated' : is_paginated, 'pages': objects_list.num_pages, - 'page': page, - 'has_previous': users_page.has_previous(), - 'has_next': users_page.has_next(), - 'previous': users_page.previous_page_number(), - 'next': users_page.next_page_number(), + 'current_page_number': page, + 'page_object': users_page, 'base_url' : base_url } paginator_context = functions.setup_paginator(paginator_data) # |