From 0c69ee13b1d2299d6973afd0144a2c827d646cd2 Mon Sep 17 00:00:00 2001
From: Sebastian Lohff <seba@someserver.de>
Date: Sat, 28 Jan 2017 19:10:40 +0100
Subject: [PATCH] Template cleanup

---
 contest/views.py                     | 4 ++--
 templates/contest/paginationNav.html | 2 +-
 templates/contest/qsoAdminTable.html | 4 ++--
 templates/contest/viewAllQSOs.html   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/contest/views.py b/contest/views.py
index 3980b8b..d71e3f9 100644
--- a/contest/views.py
+++ b/contest/views.py
@@ -162,7 +162,7 @@ def viewUserQSOs(request, uid, page=1):
 
 	userRefs = set(map(lambda _x: _x["refStr"], user.qso_set.filter(ref__isnull=False).values("ref", "refStr")))
 
-	return render(request, "contest/viewUserQSOs.html", {'owner': user, 'qsos': qsos, 'qsoPager': qsoPager, 'qsoPage': qsoPage, 'userRefs': userRefs})
+	return render(request, "contest/viewUserQSOs.html", {'owner': user, 'qsos': qsos, 'qsoPage': qsoPage, 'userRefs': userRefs})
 
 @staff_member_required
 def updateRef(request, shadow, uid):
@@ -214,7 +214,7 @@ def viewAllQSOs(request, page=1):
 	qsoPager = Paginator(qsos, 10)
 	qsoPage = getPage(qsoPager, request.GET.get('page'))
 
-	return render(request, 'contest/viewAllQSOs.html', {'qsoPager': qsoPager, 'qsoPage': qsoPage})
+	return render(request, 'contest/viewAllQSOs.html', {'qsoPage': qsoPage})
 
 def overview(request):
 	# FIXME: Hardcoded for cqtu... everywhere
diff --git a/templates/contest/paginationNav.html b/templates/contest/paginationNav.html
index 288d7fc..ca88019 100644
--- a/templates/contest/paginationNav.html
+++ b/templates/contest/paginationNav.html
@@ -5,7 +5,7 @@
         <span aria-hidden="true">&laquo;</span>
       </a>
     </li>
-	{% for pageNo in pages.page_range %}
+	{% for pageNo in page.paginator.page_range %}
     <li{% if pageNo == page.number %} class="active"{% endif %}><a href="?page={{ pageNo }}" pageNo %}">{{ pageNo }}</a></li>
 	{% endfor %}
     <li class="{% if not page.has_next %}disabled{% endif %}">
diff --git a/templates/contest/qsoAdminTable.html b/templates/contest/qsoAdminTable.html
index fa9d83a..88fe228 100644
--- a/templates/contest/qsoAdminTable.html
+++ b/templates/contest/qsoAdminTable.html
@@ -1,4 +1,4 @@
-{% include "contest/paginationNav.html" with page=qsoPage pages=qsoPager %}
+{% include "contest/paginationNav.html" with page=qsoPage %}
 <table class="table">
 	<thead>
 		<tr>
@@ -36,4 +36,4 @@
 {% endfor %}
 	</tbody>
 </table>
-{% include "contest/paginationNav.html" with page=qsoPage pages=qsoPager %}
+{% include "contest/paginationNav.html" with page=qsoPage %}
diff --git a/templates/contest/viewAllQSOs.html b/templates/contest/viewAllQSOs.html
index fe24536..f68e215 100644
--- a/templates/contest/viewAllQSOs.html
+++ b/templates/contest/viewAllQSOs.html
@@ -8,7 +8,7 @@
 		<div class="panel panel-default">
 			<div class="panel-heading">All QSOs</div>
 			<div class="panel-body">
-			{% include "contest/qsoAdminTable.html" with qsoPage=qsoPage qsoPager=qsoPager %}
+			{% include "contest/qsoAdminTable.html" with qsoPage=qsoPage %}
 			</div>
 		</div>
 	</div>