Search pagination #41
Conversation
gemet/thesaurus/urls.py
Outdated
| @@ -60,7 +60,7 @@ | |||
|
|
|||
|
|
|||
| # Search | |||
| url(r'^search/$', views.SearchView.as_view(), name='search'), | |||
| url(r'^search/page/(?P<page>\d+)/$', views.SearchView.as_view(), name='search'), | |||
There was a problem hiding this comment.
page should be a GET parameter, not a required url parameter.
gemet/thesaurus/views.py
Outdated
| @@ -24,6 +24,7 @@ | |||
| from gemet.thesaurus.utils import search_queryset, exp_decrypt, is_rdf | |||
| from gemet.thesaurus import DEFAULT_LANGCODE, NR_CONCEPTS_ON_PAGE | |||
| from gemet.thesaurus import NS_ID_VIEW_MAPPING | |||
| from django.core.paginator import Paginator | |||
There was a problem hiding this comment.
Place the import next to other django imports
| else: | ||
| return self.form_invalid(form) | ||
| else: | ||
| return super(SearchView, self).get(request, **kwargs) |
There was a problem hiding this comment.
All this processing doesn't look right. Maybe inherit from ListView and FormMixin?
| <a href="{% url 'search' language.code concepts.next_page_number %}?query={{ query }}">next</a> | ||
| {% endif %} | ||
| </span> | ||
| </div> |
There was a problem hiding this comment.
One should be able to go to any results page directly. Please use the same layout as the other paginated views use (e.g. Alphabetic Listing).
dianaboiangiu
force-pushed
the
search_pagination
branch
2 times, most recently
from
8357a1b
to
bd6ee7e
Compare
gemet/thesaurus/views.py
Outdated
| from django.core.urlresolvers import reverse | ||
| from django.db.models import Q | ||
| from django.views import View | ||
| from django.views.generic import TemplateView, ListView | ||
| from django.views.generic.detail import DetailView | ||
| from django.views.generic.edit import FormView | ||
| from django.views.generic.edit import FormView, FormMixin |
There was a problem hiding this comment.
FormMixin imported but unused.
gemet/thesaurus/views.py
Outdated
| self.query = form.cleaned_data['query'] | ||
| self.concepts = search_queryset( | ||
| self.query, | ||
| self.language, | ||
| status_values=self.status_values, | ||
| ) | ||
| page = self.request.GET.get('page', 1) | ||
| paginator = Paginator(self.concepts, 25) |
There was a problem hiding this comment.
Replace hardcoded value 25 with NR_CONCEPTS_ON_PAGE
gemet/thesaurus/views.py
Outdated
| context = self.get_context_data(form=form, paginator=paginator) | ||
| page_number = self.concepts.number | ||
| total_pages = len(self.concepts.paginator.page_range) | ||
| distance_number = 25 |
There was a problem hiding this comment.
Why 25 for distance? The other views use 9. Define a constant and use it in both places
dianaboiangiu
force-pushed
the
search_pagination
branch
from
bd6ee7e
to
7e76348
Compare
No description provided.