fix course in course view

diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index e8754e8760bfe279b3e4380353fc1741f4f5e03f..d9312784e7ba70b9475dbf5894f9c7d1e6733979 100644 (file)
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -13,17 +13,17 @@ $(document).ready(function(){
 {% endblock extra_javascript %}
 
 {% block courses %}
- {% for c in all_courses %}
-  {% for course in c.courses %}
-    <li><a href="{% url teleforma-course-detail course.id %}">{{ course.title }}</a></li>
-  {% endfor %}
+{% for c in all_courses %}
+  {% with c.course as course %}
+   <li><a href="{% url teleforma-course-detail course.id %}">{{ course.title }}</a></li>
+  {% endwith %}
  {% endfor %}
 {% endblock courses %}
 
 {% block course %}
 <div class="desk_center">
     {% for c in courses %}
-     {% for course in c.courses %}
+     {% with c.course as course %}
       {% for type in c.types %}
       <div class="course">
         <div class="course_title">{{ course.title }} - {{ type }}{% if course.description %} - {{ course.description }}{% endif %}
@@ -43,7 +43,7 @@ $(document).ready(function(){
 
         </div>
       {% endfor %}
-     {% endfor %}
+     {% endwith %}
     {% endfor %}
 </div>
 {% endblock course %}

diff --git a/teleforma/views.py b/teleforma/views.py
index e40bdcec6446cc56325939919e8c59139ebed3df..b2422d53b1d54f4bf9ddcbe3ff285800217be932 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -154,9 +154,8 @@ class CourseView(DetailView):
         all_courses = get_courses(self.request.user)
         courses = []
         for c in all_courses:
-            for co in c['courses']:
-                if co == course:
-                    courses.append({'courses': c['courses'].filter(id=course.id), 'types': c['types']})
+            if c['course'] == course:
+                courses = format_courses(courses, course=course, types=c['types'])
         context['courses'] = courses
         context['all_courses'] = all_courses
         context['notes'] = course.notes.all().filter(author=self.request.user)