module courses in title order, timeline on the desk

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 454aa4c0a629299e3af51e194e1559d36b4c7576..d955cf17f5f4edeaf8702b928a0bca467f486909 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -23,7 +23,7 @@ $(document).ready(function(){
 <div style="background: white;">
 <ul>
 {% block courses %}
-{% for course in object_list %}
+{% for course in courses %}
 <li><a href="{% url teleforma-course-detail course.id %}">{{ course.title}} {{ course.type }}</a></li>
 {% endfor %}
 {% endblock courses %}

diff --git a/teleforma/views.py b/teleforma/views.py
index 9e8c9bd7e552f2a6f5a927f36ef9c075224f029b..d879a98ec92a3cac599e37e414befcba02a649f4 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -34,7 +34,6 @@ import jqchat.models
 from xlwt import Workbook
 
 
-
 def render(request, template, data = None, mimetype = None):
     return render_to_response(template, data, context_instance=RequestContext(request),
                               mimetype=mimetype)
@@ -50,7 +49,6 @@ def get_courses(user):
         courses = Course.objects.all()
     else:
         courses = None
-    courses = courses.order_by('-date_modified')
     return courses
 
 def stream_from_file(__file):
@@ -118,10 +116,11 @@ class CoursesView(ListView):
     template_name='teleforma/courses.html'
 
     def get_queryset(self):
-        return get_courses(self.request.user)
+        return get_courses(self.request.user).order_by('-date_modified')
 
     def get_context_data(self, **kwargs):
         context = super(CoursesView, self).get_context_data(**kwargs)
+        context['courses'] = self.object_list.order_by('title')
         context['notes'] = Note.objects.filter(author=self.request.user)
         context['room'] = get_room(name='site')
         return context