From 8ca9c4fb711bb51fa0fde786bec3fa06f223c041 Mon Sep 17 00:00:00 2001 From: yomguy Date: Mon, 11 Jun 2012 11:06:25 +0200 Subject: [PATCH] fix course in course view --- teleforma/templates/teleforma/course_detail.html | 12 ++++++------ teleforma/views.py | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html index e8754e87..d9312784 100644 --- 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 %} -
  • {{ course.title }}
  • - {% endfor %} +{% for c in all_courses %} + {% with c.course as course %} +
  • {{ course.title }}
  • + {% endwith %} {% endfor %} {% endblock courses %} {% block course %}
    {% for c in courses %} - {% for course in c.courses %} + {% with c.course as course %} {% for type in c.types %}
    {{ course.title }} - {{ type }}{% if course.description %} - {{ course.description }}{% endif %} @@ -43,7 +43,7 @@ $(document).ready(function(){
    {% endfor %} - {% endfor %} + {% endwith %} {% endfor %}
    {% endblock course %} diff --git a/teleforma/views.py b/teleforma/views.py index e40bdcec..b2422d53 100755 --- 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) -- 2.39.5