From 4581f1e586fc650422152c699e489868649a844b Mon Sep 17 00:00:00 2001
From: Diana Boiangiu <boiangiudiana58@gmail.com>
Date: Thu, 30 Mar 2017 16:12:04 +0300
Subject: [PATCH 1/3] [refs #83728] Add pagination for search

---
 gemet/thesaurus/templates/header.html | 11 ++++-----
 gemet/thesaurus/templates/search.html | 20 +++++++++++++---
 gemet/thesaurus/urls.py               |  2 +-
 gemet/thesaurus/views.py              | 34 +++++++++++++++++++++++++--
 4 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/gemet/thesaurus/templates/header.html b/gemet/thesaurus/templates/header.html
index f1f1bef..88234b1 100644
--- a/gemet/thesaurus/templates/header.html
+++ b/gemet/thesaurus/templates/header.html
@@ -21,8 +21,8 @@
   <a class="alphabet {% active request 'alphabetic' langcode=language.code %}"
      href="{% url 'alphabetic' language.code %}">Alphabetic Listings</a>
   <!-- &nbsp;|&nbsp; -->
-  <!-- <a href="{% url 'search' language.code %}">Search Thesaurus</a> -->
-  <a class="search-button {% active request 'search' langcode=language.code %}">
+  <!-- <a href="{% url 'search' language.code 1 %}">Search Thesaurus</a> -->
+  <a class="search-button {% active request 'search' langcode=language.code page=1 %}">
     Search Thesaurus
   </a>
 </div>
@@ -32,19 +32,18 @@
     <select name="select-language" id="js-change-language">
       {% for lang in languages %}
         <option value="{{ lang.code }}"
-        href="{% if code %}{% url view lang.code code %}{% else %}{% url view lang.code %}{% endif %}{% if get_params %}?{{ get_params }}{% endif %}"
+        href="{% if code %}{% url view lang.code code %}{% elif page %}{% url view lang.code page %}?query={{ query }}{% else %}{% url view lang.code  %}{% endif %}{% if get_params %}?{{ get_params }}{% endif %}"
         {% if language.code == lang.code%}selected="selected"{% endif %}
           >{{ lang.name }}</option>
       {% endfor %}
     </select>
   </div>
 
-  <form method="post"
-        action='{% url 'search' language.code %}'
+  <form method="get"
+        action='{% url "search" language.code 1 %}'
         id='search-form'
         name="search-query"
         placeholder="Concepts, Groups, Themes...">
-    {% csrf_token %}
     {{ search_form }}
     <button type="submit" value="Search">Search</button>
   </form>
diff --git a/gemet/thesaurus/templates/search.html b/gemet/thesaurus/templates/search.html
index 5c3e59d..9680149 100644
--- a/gemet/thesaurus/templates/search.html
+++ b/gemet/thesaurus/templates/search.html
@@ -6,11 +6,10 @@
 {% endblock %}
 
 {% block content %}
-  {% include 'header.html' with view='search' %}
-
+  {% include 'header.html' with view='search' page=1 query=query %}
   {% if query %}
     <div>
-      <span class="results-nr">{{ concepts|length }} results found.</span>
+      <span class="results-nr">{{ paginator.count }} results found.</span>
       <span>Searched for '<b>{{ query }}</b>'</span>
     </div>
     {% if concepts|length %}
@@ -50,6 +49,21 @@
     {% endif %}
   {% endif %}
 
+<div class="pagination">
+    <span class="step-links">
+        {% if concepts.has_previous %}
+            <a href="{% url 'search' language.code concepts.previous_page_number %}?query={{ query }}">previous</a>
+        {% endif %}
+
+        <span class="current">
+            Page {{ concepts.number }} of {{ concepts.paginator.num_pages }}
+        </span>
+
+        {% if concepts.has_next %}
+            <a href="{% url 'search' language.code concepts.next_page_number %}?query={{ query }}">next</a>
+        {% endif %}
+    </span>
+</div>
 {% endblock %}
 
 {% block version %}
diff --git a/gemet/thesaurus/urls.py b/gemet/thesaurus/urls.py
index 07aedd5..e93e9ee 100644
--- a/gemet/thesaurus/urls.py
+++ b/gemet/thesaurus/urls.py
@@ -66,7 +66,7 @@
         url(r'^exports/rdf$', views.DownloadView.as_view(), name='download'),
 
         # Search
-        url(r'^search/$', views.SearchView.as_view(), name='search'),
+        url(r'^search/page/(?P<page>\d+)/$', views.SearchView.as_view(), name='search'),
 
         # List pages
         url(r'^groups/$', views.GroupsView.as_view(), name='groups'),
diff --git a/gemet/thesaurus/views.py b/gemet/thesaurus/views.py
index c1ca67c..2edbc83 100644
--- a/gemet/thesaurus/views.py
+++ b/gemet/thesaurus/views.py
@@ -7,6 +7,7 @@
 
 from django.http import Http404, StreamingHttpResponse
 from django.shortcuts import render, get_object_or_404, redirect
+from django.core.paginator import Paginator
 from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.views import View
@@ -236,17 +237,46 @@ def get_context_data(self, **kwargs):
             "namespace": Term.NAMESPACE,
             "status_values": self.status_values,
         })
+        if 'paginator' in kwargs:
+            context.update({
+                "paginator": kwargs['paginator']
+            })
         return context
 
-    def form_valid(self, form):
+    def form_valid(self, form, **kwargs):
         self.query = form.cleaned_data['query']
         self.concepts = search_queryset(
             self.query,
             self.language,
             status_values=self.status_values,
         )
+        page = kwargs.get('page', 1)
+        paginator = Paginator(self.concepts, 25)
+        self.concepts = paginator.page(page)
+        return self.render_to_response(
+            self.get_context_data(
+                form=form,
+                paginator=paginator
+            )
+        )
+
+    def get_form_kwargs(self):
+        kwargs = super(SearchView, self).get_form_kwargs()
+        if self.request.method in ('GET', ):
+            kwargs.update({
+                'data': self.request.GET
+            })
+        return kwargs
 
-        return self.render_to_response(self.get_context_data(form=form))
+    def get(self, request, *args, **kwargs):
+        if 'query' in request.GET:
+            form = self.get_form()
+            if form.is_valid():
+                return self.form_valid(form, **kwargs)
+            else:
+                return self.form_invalid(form)
+        else:
+            return super(SearchView, self).get(request, **kwargs)
 
 
 class RelationsView(HeaderMixin, StatusMixin, VersionMixin, TemplateView):

From 1ecb3904b23ade1cac34a299e0a6c4c31dafefe3 Mon Sep 17 00:00:00 2001
From: Diana Boiangiu <boiangiudiana58@gmail.com>
Date: Thu, 6 Apr 2017 17:23:45 +0300
Subject: [PATCH 2/3] [refs #83728] Make page param optional for search url;
 Use same layout for page's display on search

---
 gemet/thesaurus/templates/header.html |  8 +++----
 gemet/thesaurus/templates/search.html | 33 +++++++++++++++++----------
 gemet/thesaurus/urls.py               |  2 +-
 gemet/thesaurus/views.py              | 21 +++++++++++------
 4 files changed, 40 insertions(+), 24 deletions(-)

diff --git a/gemet/thesaurus/templates/header.html b/gemet/thesaurus/templates/header.html
index 88234b1..b7dfb26 100644
--- a/gemet/thesaurus/templates/header.html
+++ b/gemet/thesaurus/templates/header.html
@@ -21,8 +21,8 @@
   <a class="alphabet {% active request 'alphabetic' langcode=language.code %}"
      href="{% url 'alphabetic' language.code %}">Alphabetic Listings</a>
   <!-- &nbsp;|&nbsp; -->
-  <!-- <a href="{% url 'search' language.code 1 %}">Search Thesaurus</a> -->
-  <a class="search-button {% active request 'search' langcode=language.code page=1 %}">
+  <!-- <a href="{% url 'search' language.code %}">Search Thesaurus</a> -->
+  <a class="search-button {% active request 'search' langcode=language.code %}">
     Search Thesaurus
   </a>
 </div>
@@ -32,7 +32,7 @@
     <select name="select-language" id="js-change-language">
       {% for lang in languages %}
         <option value="{{ lang.code }}"
-        href="{% if code %}{% url view lang.code code %}{% elif page %}{% url view lang.code page %}?query={{ query }}{% else %}{% url view lang.code  %}{% endif %}{% if get_params %}?{{ get_params }}{% endif %}"
+        href="{% if code %}{% url view lang.code code %}{% else %}{% url view lang.code  %}{% endif %}{% if get_params %}?{{ get_params }}{% endif %}"
         {% if language.code == lang.code%}selected="selected"{% endif %}
           >{{ lang.name }}</option>
       {% endfor %}
@@ -40,7 +40,7 @@
   </div>
 
   <form method="get"
-        action='{% url "search" language.code 1 %}'
+        action='{% url "search" language.code %}'
         id='search-form'
         name="search-query"
         placeholder="Concepts, Groups, Themes...">
diff --git a/gemet/thesaurus/templates/search.html b/gemet/thesaurus/templates/search.html
index 9680149..46c0243 100644
--- a/gemet/thesaurus/templates/search.html
+++ b/gemet/thesaurus/templates/search.html
@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block content %}
-  {% include 'header.html' with view='search' page=1 query=query %}
+  {% include 'header.html' with view='search' query=query %}
   {% if query %}
     <div>
       <span class="results-nr">{{ paginator.count }} results found.</span>
@@ -49,21 +49,30 @@
     {% endif %}
   {% endif %}
 
-<div class="pagination">
-    <span class="step-links">
+  <div class="pagination clearfix">
+      <div class="float-right">
+        <!-- prev -->
         {% if concepts.has_previous %}
-            <a href="{% url 'search' language.code concepts.previous_page_number %}?query={{ query }}">previous</a>
+          <a class="no-visit" href="?page={{ concepts.previous_page_number }}&query={{ query }}">Previous</a>
         {% endif %}
-
-        <span class="current">
-            Page {{ concepts.number }} of {{ concepts.paginator.num_pages }}
-        </span>
-
+        &ensp;
+        <!-- next -->
         {% if concepts.has_next %}
-            <a href="{% url 'search' language.code concepts.next_page_number %}?query={{ query }}">next</a>
+          <a class="no-visit" href="?page={{ concepts.next_page_number }}&query={{ query }}">Next</a>
         {% endif %}
-    </span>
-</div>
+      </div>
+
+      <!-- pages -->
+      Pages:
+      {% for page_number in visible_pages %}
+        {% if page_number == page_obj.number %}
+          {{ page_number }}
+        {% else %}
+          <a href="?page={{ page_number }}&query={{ query }}">{{ page_number }}</a>
+        {% endif %}
+      {% endfor %}
+  </div>
+
 {% endblock %}
 
 {% block version %}
diff --git a/gemet/thesaurus/urls.py b/gemet/thesaurus/urls.py
index e93e9ee..07aedd5 100644
--- a/gemet/thesaurus/urls.py
+++ b/gemet/thesaurus/urls.py
@@ -66,7 +66,7 @@
         url(r'^exports/rdf$', views.DownloadView.as_view(), name='download'),
 
         # Search
-        url(r'^search/page/(?P<page>\d+)/$', views.SearchView.as_view(), name='search'),
+        url(r'^search/$', views.SearchView.as_view(), name='search'),
 
         # List pages
         url(r'^groups/$', views.GroupsView.as_view(), name='groups'),
diff --git a/gemet/thesaurus/views.py b/gemet/thesaurus/views.py
index 2edbc83..de4a767 100644
--- a/gemet/thesaurus/views.py
+++ b/gemet/thesaurus/views.py
@@ -13,7 +13,7 @@
 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
 from django.conf import settings
 
 from gemet.thesaurus.models import Concept, DefinitionSource, Group, Language
@@ -250,15 +250,22 @@ def form_valid(self, form, **kwargs):
             self.language,
             status_values=self.status_values,
         )
-        page = kwargs.get('page', 1)
+        page = self.request.GET.get('page', 1)
         paginator = Paginator(self.concepts, 25)
         self.concepts = paginator.page(page)
-        return self.render_to_response(
-            self.get_context_data(
-                form=form,
-                paginator=paginator
+
+        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
+
+        context.update({
+            'visible_pages': range(
+                max(1, page_number - distance_number),
+                min(page_number + distance_number + 1, total_pages + 1)
             )
-        )
+        })
+        return self.render_to_response(context)
 
     def get_form_kwargs(self):
         kwargs = super(SearchView, self).get_form_kwargs()

From 7e763484e502b5b0301d7dd66f2351a4e04f1df2 Mon Sep 17 00:00:00 2001
From: Diana Boiangiu <boiangiudiana58@gmail.com>
Date: Thu, 20 Apr 2017 15:10:53 +0300
Subject: [PATCH 3/3] [refs #83728] Remove hardcoded values from search view

---
 gemet/thesaurus/__init__.py |  1 +
 gemet/thesaurus/views.py    | 12 ++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/gemet/thesaurus/__init__.py b/gemet/thesaurus/__init__.py
index a231f3f..7667a99 100644
--- a/gemet/thesaurus/__init__.py
+++ b/gemet/thesaurus/__init__.py
@@ -1,4 +1,5 @@
 NR_CONCEPTS_ON_PAGE = 40
+DISTANCE_NUMBER = 9
 DEFAULT_LANGCODE = 'en'
 
 PENDING = 0
diff --git a/gemet/thesaurus/views.py b/gemet/thesaurus/views.py
index de4a767..862461d 100644
--- a/gemet/thesaurus/views.py
+++ b/gemet/thesaurus/views.py
@@ -13,7 +13,7 @@
 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, FormMixin
+from django.views.generic.edit import FormView
 from django.conf import settings
 
 from gemet.thesaurus.models import Concept, DefinitionSource, Group, Language
@@ -22,8 +22,8 @@
 from gemet.thesaurus.collation_charts import unicode_character_map
 from gemet.thesaurus.forms import SearchForm, ExportForm
 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 gemet.thesaurus import DEFAULT_LANGCODE, DISTANCE_NUMBER
+from gemet.thesaurus import NR_CONCEPTS_ON_PAGE, NS_ID_VIEW_MAPPING
 from gemet.thesaurus import PUBLISHED, PENDING, DELETED_PENDING
 
 
@@ -251,13 +251,13 @@ def form_valid(self, form, **kwargs):
             status_values=self.status_values,
         )
         page = self.request.GET.get('page', 1)
-        paginator = Paginator(self.concepts, 25)
+        paginator = Paginator(self.concepts, NR_CONCEPTS_ON_PAGE)
         self.concepts = paginator.page(page)
 
         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
+        distance_number = DISTANCE_NUMBER
 
         context.update({
             'visible_pages': range(
@@ -488,7 +488,7 @@ def get_context_data(self, **kwargs):
         context = super(PaginatorView, self).get_context_data(**kwargs)
         page_number = context['page_obj'].number
         total_pages = len(context['page_obj'].paginator.page_range)
-        distance_number = 9
+        distance_number = DISTANCE_NUMBER
 
         context.update({
             'letters': self.letters,