From 75e8fb06b42420f21c8571341ef8300a102cd2c7 Mon Sep 17 00:00:00 2001
From: CruiseDevice
Date: Thu, 2 Jan 2020 16:18:59 +0530
Subject: Resolve conflicts

---
 yaksh/views.py | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'yaksh/views.py')

diff --git a/yaksh/views.py b/yaksh/views.py
index 7e9b706..d82d4e0 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -1497,7 +1497,16 @@ def show_all_questions(request):
     user_tags = questions.values_list('tags', flat=True).distinct()
     all_tags = Tag.objects.filter(id__in=user_tags)
     upload_form = UploadFileForm()
+    paginator = Paginator(questions, 10)
+    page = request.GET.get('page')
+    try:
+        questions = paginator.page(page)
+    except PageNotAnInteger:
+        questions = paginator.page(1)
+    except EmptyPage:
+        questions = paginator.page(paginator.num_pages)
     context['questions'] = questions
+    context['objects'] = questions
     context['all_tags'] = all_tags
     context['papers'] = []
     context['question'] = None
-- 
cgit