diff --git a/lms/djangoapps/dashboard/sysadmin.py b/lms/djangoapps/dashboard/sysadmin.py
index 828ef83634..6632aba3d2 100644
--- a/lms/djangoapps/dashboard/sysadmin.py
+++ b/lms/djangoapps/dashboard/sysadmin.py
@@ -15,6 +15,7 @@ from django.contrib.auth import authenticate
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User
from django.core.exceptions import PermissionDenied
+from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
from django.db import IntegrityError
from django.http import HttpResponse, Http404
from django.utils.decorators import method_decorator
@@ -684,6 +685,8 @@ class GitLogs(TemplateView):
if course_id:
course_id = SlashSeparatedCourseKey.from_deprecated_string(course_id)
+ page_size = 10
+
# Set mongodb defaults even if it isn't defined in settings
mongo_db = {
'host': 'localhost',
@@ -715,7 +718,7 @@ class GitLogs(TemplateView):
# Require staff if not going to specific course
if not request.user.is_staff:
raise Http404
- cilset = CourseImportLog.objects.all().order_by('-created')
+ cilset = CourseImportLog.objects.order_by('-created')
else:
try:
course = get_course_by_id(course_id)
@@ -729,11 +732,27 @@ class GitLogs(TemplateView):
CourseStaffRole(course.id).has_user(request.user)):
raise Http404
log.debug('course_id={0}'.format(course_id))
- cilset = CourseImportLog.objects.filter(course_id=course_id).order_by('-created')
+ cilset = CourseImportLog.objects.filter(
+ course_id=course_id
+ ).order_by('-created')
log.debug('cilset length={0}'.format(len(cilset)))
+
+ # Paginate the query set
+ paginator = Paginator(cilset, page_size)
+ try:
+ logs = paginator.page(request.GET.get('page'))
+ except PageNotAnInteger:
+ logs = paginator.page(1)
+ except EmptyPage:
+ # If the page is too high
+ logs = paginator.page(paginator.num_pages)
+
mdb.disconnect()
- context = {'cilset': cilset,
- 'course_id': course_id.to_deprecated_string() if course_id else None,
- 'error_msg': error_msg}
+ context = {
+ 'logs': logs,
+ 'course_id': course_id.to_deprecated_string() if course_id else None,
+ 'error_msg': error_msg,
+ 'page_size': page_size
+ }
return render_to_response(self.template_name, context)
diff --git a/lms/djangoapps/dashboard/tests/test_sysadmin.py b/lms/djangoapps/dashboard/tests/test_sysadmin.py
index a674abee4a..19c3df4b79 100644
--- a/lms/djangoapps/dashboard/tests/test_sysadmin.py
+++ b/lms/djangoapps/dashboard/tests/test_sysadmin.py
@@ -582,6 +582,34 @@ class TestSysAdminMongoCourseImport(SysadminBaseTestCase):
self._rm_edx4edx()
+ def test_gitlog_pagination_out_of_range_invalid(self):
+ """
+ Make sure the pagination behaves properly when the requested page is out
+ of range.
+ """
+
+ self._setstaff_login()
+ self._mkdir(getattr(settings, 'GIT_REPO_DIR'))
+
+ self._add_edx4edx()
+
+ for page in [-1, 0, 1, 2, 'abc']:
+ # Test the page parameter in various different ways
+ response = self.client.get(
+ '{}?page={}'.format(
+ reverse('gitlogs_detail', kwargs={
+ 'course_id': 'MITx/edx4edx/edx4edx'
+ }),
+ page
+ )
+ )
+ self.assertIn(
+ 'Page 1 of 1',
+ response.content
+ )
+
+ self._rm_edx4edx()
+
def test_gitlog_courseteam_access(self):
"""
Ensure course team users are allowed to access only their own course.
diff --git a/lms/templates/sysadmin_dashboard_gitlogs.html b/lms/templates/sysadmin_dashboard_gitlogs.html
index 7f8608ac28..a105894da0 100644
--- a/lms/templates/sysadmin_dashboard_gitlogs.html
+++ b/lms/templates/sysadmin_dashboard_gitlogs.html
@@ -30,6 +30,28 @@
});
+<%def name="pagination()">
+
+