Display proper page for search and notifications divided paginator

boards/views/notifications.py

@@ -1,51 +1,52
 from django.shortcuts import render
 from django.urls import reverse
 
 from boards.abstracts.constants import PARAM_PAGE
 from boards.abstracts.paginator import get_paginator
 from boards.abstracts.settingsmanager import get_settings_manager, \
     SETTING_LAST_NOTIFICATION_ID
 from boards.models.user import Notification
 from boards.views.base import BaseBoardView
 from boards.views.mixins import PaginatedMixin
 
 DEFAULT_PAGE = '1'
 
 TEMPLATE = 'boards/notifications.html'
 PARAM_USERNAMES = 'notification_usernames'
 RESULTS_PER_PAGE = 10
 
 
 class NotificationView(BaseBoardView, PaginatedMixin):
 
     def get(self, request, username=None):
         params = self.get_context_data()
 
         settings_manager = get_settings_manager(request)
 
         # If we open our notifications, reset the "new" count
         if username is None:
             notification_usernames = settings_manager.get_notification_usernames()
         else:
             notification_usernames = [username]
 
         posts = Notification.objects.get_notification_posts(
                 usernames=notification_usernames, user_settings=settings_manager.get_user_settings())
 
         if username is None:
             last = posts.first()
             if last is not None:
                 last_id = last.id
                 settings_manager.set_setting(SETTING_LAST_NOTIFICATION_ID,
                                              last_id)
 
         page = int(request.GET.get(PARAM_PAGE, DEFAULT_PAGE))
         paginator = get_paginator(posts, RESULTS_PER_PAGE,
                                   link=reverse('notifications'),
                                   params=request.GET.dict())
+        paginator.current_page = page
 
         params[PARAM_PAGE] = paginator.page(page)
         params[PARAM_USERNAMES] = notification_usernames
         params.update(self.get_page_context(paginator, page))
 
         return render(request, TEMPLATE, params)

boards/views/search.py

@@ -1,55 +1,55
 from django.shortcuts import render
 from django.views.generic import View
 from django.db.models import Q
 from django.urls import reverse
 
 from boards.abstracts.paginator import get_paginator
 from boards.forms import SearchForm, PlainErrorList
 from boards.models import Post, Tag
 from boards.views.mixins import PaginatedMixin
 
 
 MIN_QUERY_LENGTH = 3
 RESULTS_PER_PAGE = 10
 
 FORM_QUERY = 'query'
 
 CONTEXT_QUERY = 'query'
 CONTEXT_FORM = 'form'
-CONTEXT_PAGE = 'page'
 CONTEXT_TAGS = 'tags'
 
 REQUEST_PAGE = 'page'
 
 __author__ = 'neko259'
 
 TEMPLATE = 'search/search.html'
 
 
 class BoardSearchView(View, PaginatedMixin):
     def get(self, request):
         params = dict()
 
         form = SearchForm(request.GET, error_class=PlainErrorList)
         params[CONTEXT_FORM] = form
 
         if form.is_valid():
             query = form.cleaned_data[FORM_QUERY]
             if len(query) >= MIN_QUERY_LENGTH:
+                page = int(request.GET.get(REQUEST_PAGE, '1'))
+
                 results = Post.objects.filter(Q(text__icontains=query)
                         | Q(title__icontains=query) | Q(opening=True,
                             thread__tags__aliases__name__icontains=query)
                         | Q(attachments__url__icontains=query)).order_by('-id').distinct()
                 paginator = get_paginator(results, RESULTS_PER_PAGE,
                                           link=reverse('search'),
                                           params=request.GET.dict())
-
-                page = int(request.GET.get(REQUEST_PAGE, '1'))
+                paginator.current_page = page
 
                 params[CONTEXT_QUERY] = query
                 params.update(self.get_page_context(paginator, page))
 
                 tags = Tag.objects.get_tag_url_list(Tag.objects.filter(aliases__name__icontains=query))
                 params[CONTEXT_TAGS] = tags
 
         return render(request, TEMPLATE, params)