diff options
| author | Prabhu Ramachandran | 2017-11-06 16:53:07 +0530 |
|---|---|---|
| committer | GitHub | 2017-11-06 16:53:07 +0530 |
| commit | 807a52e45a9b6c6ac64a7a5e4bd8248900fb4367 (patch) | |
| tree | 9d3ee3e2db55bd2d962aa6632159cc2d122405aa | |
| parent | 6b8ecc840698b7793c1d8fd350da8c85f1b02b7d (diff) | |
| parent | 52afb684b1bd59cc1d5f2f1a6963b877a5604b37 (diff) | |
| download | online_test-807a52e45a9b6c6ac64a7a5e4bd8248900fb4367.tar.gz online_test-807a52e45a9b6c6ac64a7a5e4bd8248900fb4367.tar.bz2 online_test-807a52e45a9b6c6ac64a7a5e4bd8248900fb4367.zip | |
Merge pull request #376 from Akshen/develop
Fix Course Ordering in Courses Page
| -rw-r--r-- | CHANGELOG.txt | 1 | ||||
| -rw-r--r-- | yaksh/views.py | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt index ab9e4b2..7da93c4 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -12,6 +12,7 @@ * Fixed a bug that did not allow expected input in Standard I/O type question to be none. * UI changes in grade user, view answerpaper and monitor pages. * Fixed a bug that would require shebang to be put in for Bash assertion based questions. +* Updated Courses Page to show Active Courses on top. === 0.6.0 (11-05-2017) === diff --git a/yaksh/views.py b/yaksh/views.py index c50ba33..63da956 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -792,8 +792,10 @@ def courses(request): ci = RequestContext(request) if not is_moderator(user): raise Http404('You are not allowed to view this page') - courses = Course.objects.filter(creator=user, is_trial=False) - allotted_courses = Course.objects.filter(teachers=user, is_trial=False) + courses = Course.objects.filter( + creator=user, is_trial=False).order_by('-active', '-id') + allotted_courses = Course.objects.filter( + teachers=user, is_trial=False).order_by('-active', '-id') context = {'courses': courses, "allotted_courses": allotted_courses} return my_render_to_response('yaksh/courses.html', context, context_instance=ci) |