From b79b0ca58c7dc465064be6e6b3c90f8057773952 Mon Sep 17 00:00:00 2001
From: Simon <fortier.simon@hotmail.com>
Date: Thu, 7 Jun 2018 13:49:08 -0400
Subject: [PATCH] Results per page now configurable

---
 README.md             | 1 +
 app.py                | 8 ++++----
 templates/search.html | 8 +++-----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index ddf0d21..3ae41a0 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,7 @@ CAPTCHA_SITE_KEY = ""
 CAPTCHA_SECRET_KEY = ""
 FLASK_SECRET = ""
 USE_SSL = True
+RESULTS_PER_PAGE = (25, 50, 100, 250, 500, 1000)
 ```
 
 ## Running
diff --git a/app.py b/app.py
index 14522a7..93de8dd 100644
--- a/app.py
+++ b/app.py
@@ -95,8 +95,6 @@ def websites():
 @app.route("/search")
 def search():
 
-    RESULTS_PER_PAGE = (25, 50, 100, 250, 1000)
-
     q = request.args.get("q") if "q" in request.args else ""
     sort_order = request.args.get("sort_order") if "sort_order" in request.args else "score"
 
@@ -105,7 +103,7 @@ def search():
 
     per_page = request.args.get("per_page") if "per_page" in request.args else "50"
     per_page = int(per_page) if per_page.isdigit() else "50"
-    per_page = per_page if per_page in RESULTS_PER_PAGE else 50
+    per_page = per_page if per_page in config.RESULTS_PER_PAGE else 50
 
     if q:
         try:
@@ -116,7 +114,9 @@ def search():
     else:
         hits = None
 
-    return render_template("search.html", results=hits, q=q, p=page, sort_order=sort_order, per_page=per_page)
+    return render_template("search.html",
+                           results=hits, q=q, p=page, sort_order=sort_order,
+                           per_page=per_page, results_set=config.RESULTS_PER_PAGE)
 
 
 @app.route("/contribute")
diff --git a/templates/search.html b/templates/search.html
index 550a876..c8bf5ec 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -27,11 +27,9 @@
                         <div class="form-group col-md-2">
                             <select class="form-control" name="per_page" title="Results per page">
                                 <option disabled>Results per page</option>
-                                <option{{ " selected" if per_page == 25 }}>25</option>
-                                <option{{ " selected" if per_page == 50 }}>50</option>
-                                <option{{ " selected" if per_page == 100 }}>100</option>
-                                <option{{ " selected" if per_page == 250 }}>250</option>
-                                <option{{ " selected" if per_page == 1000 }}>1000</option>
+                                {% for results in results_set %}
+                                    <option{{ " selected" if per_page == results }}>{{ results }}</option>
+                                {% endfor %}
                             </select>
                         </div>
                     </div>