From 2d9279957319673516b624e977b78e41c8c05493 Mon Sep 17 00:00:00 2001
From: moamoak <kervella.mael@gmail.com>
Date: Thu, 3 May 2018 14:13:14 +0200
Subject: [PATCH] Revert "Merge branch 'paginateur' into 'master'"

This reverts merge request !151
---
 re2o/utils.py | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/re2o/utils.py b/re2o/utils.py
index 8a4e4553..75304369 100644
--- a/re2o/utils.py
+++ b/re2o/utils.py
@@ -340,20 +340,16 @@ def re2o_paginator(request, query_set, pagination_number):
     :request:
     :query_set: Query_set to paginate
     :pagination_number: Number of entries to display"""
-    if query_set.count() > pagination_number:
-        paginator = Paginator(query_set, pagination_number)
-        page = request.GET.get('page')
-        try:
-            results = paginator.page(page)
-        except PageNotAnInteger:
-            # If page is not an integer, deliver first page.
-            results = paginator.page(1)
-        except EmptyPage:
-            # If page is out of range (e.g. 9999), deliver last page of results.
-            results = paginator.page(paginator.num_pages)
-    else:
-        #If there is only one page, deliver the page without paginator
-        return query_set
+    paginator = Paginator(query_set, pagination_number)
+    page = request.GET.get('page')
+    try:
+        results = paginator.page(page)
+    except PageNotAnInteger:
+        # If page is not an integer, deliver first page.
+        results = paginator.page(1)
+    except EmptyPage:
+        # If page is out of range (e.g. 9999), deliver last page of results.
+        results = paginator.page(paginator.num_pages)
     return results