diff options
| author | adityacp | 2020-03-02 11:07:17 +0530 |
|---|---|---|
| committer | adityacp | 2020-03-02 11:07:17 +0530 |
| commit | 718f475f279a0600b7157a8c82d3198ee87b7a32 (patch) | |
| tree | 6f84786ef9121a2f519fc5c635f3a4ba2ed223b9 /yaksh/views.py | |
| parent | 78cc032340a8f0c8e0d456770783f2c894935c04 (diff) | |
| parent | 2bf66a0cdf07764d91e0274a1effb050075a1206 (diff) | |
| download | online_test-718f475f279a0600b7157a8c82d3198ee87b7a32.tar.gz online_test-718f475f279a0600b7157a8c82d3198ee87b7a32.tar.bz2 online_test-718f475f279a0600b7157a8c82d3198ee87b7a32.zip | |
Merge branch 'master' of https://github.com/FOSSEE/online_test into bump_django
Diffstat (limited to 'yaksh/views.py')
| -rw-r--r-- | yaksh/views.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/yaksh/views.py b/yaksh/views.py index 6d5ae08..3aeaada 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -409,7 +409,7 @@ def prof_manage(request, msg=None): courses = Course.objects.get_queryset().filter( Q(creator=user) | Q(teachers=user), is_trial=False).distinct().order_by("-active") - paginator = Paginator(courses, 30) + paginator = Paginator(courses, 20) page = request.GET.get('page') courses = paginator.get_page(page) messages.info(request, msg) @@ -1223,7 +1223,7 @@ def monitor(request, quiz_id=None, course_id=None): courses = Course.objects.filter( Q(creator=user) | Q(teachers=user), is_trial=False - ).order_by("-id").distinct() + ).order_by("-active").distinct() paginator = Paginator(courses, 30) page = request.GET.get('page') courses = paginator.get_page(page) @@ -1678,7 +1678,7 @@ def grade_user(request, quiz_id=None, user_id=None, attempt_number=None, if not course_id: courses = Course.objects.filter( Q(creator=current_user) | Q(teachers=current_user), is_trial=False - ).order_by("-id").distinct() + ).order_by("-active").distinct() paginator = Paginator(courses, 30) page = request.GET.get('page') courses = paginator.get_page(page) @@ -2138,7 +2138,7 @@ def new_activation(request, email=None): try: user = User.objects.get(email=email) except MultipleObjectsReturned: - context['email_err_msg'] = "Multiple entries found for this email"\ + context['email_err_msg'] = "Multiple entries found for this email "\ "Please change your email" return my_render_to_response( request, 'yaksh/activation_status.html', context |