fix course detail

diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index fc44478a9fe4f4094a24be6742d9c6822f145f65..42a576cebb7a96c49f28aed757d0ca8d2dd47855 100644 (file)
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -13,45 +13,44 @@ $(document).ready(function(){
 {% endblock extra_javascript %}
 
 {% block courses %}
-{% for course in courses %}
-<li><a href="{% url teleforma-course-detail course.id %}">{{ course.title}} {{ course.type }}</a></li>
-{% endfor %}
+ {% for c in all_courses %}
+  {% for course in c.courses %}
+    <li><a href="{% url teleforma-course-detail course.id %}">{{ course.title }}</a></li>
+  {% endfor %}
+ {% endfor %}
 {% endblock courses %}
 
 {% block course %}
 <div class="desk_media">
-<div class="course">
-
-<div class="course_title">{{ course.title }}{% if course.description %} - {{ course.description }}{% endif %}
-</div>
-
-{% if course.conference.all or course.document.all or course.media.all %}
+    {% for c in courses %}
+     {% for course in c.courses %}
+      {% for type in c.types %}
+      <div class="course">
+        <div class="course_title">{{ course.title }} - {{ type }}{% if course.description %} - {{ course.description }}{% endif %}
+        </div>
 
-{% block document %}
-{% with course as course and %}
-{% include "teleforma/inc/document_list.html" %}
-{% endwith %}
-{% endblock %}
-
-{% block conference %}
-{% with course as course and %}
-{% include "teleforma/inc/conference_list.html" %}
-{% endwith %}
-{% endblock %}
+        {% block document %}
+        {% with course as course and type as type %}
+        {% include "teleforma/inc/document_list.html" %}
+        {% endwith %}
+        {% endblock %}
 
-{% block media %}
-{% with course as course and %}
-{% include "teleforma/inc/media_list.html" %}
-{% endwith %}
-{% endblock %}
+        {% block conference %}
+        {% with course as course  %}
+        {% include "teleforma/inc/conference_list.html" %}
+        {% endwith %}
+        {% endblock %}
 
-{% else %}
-<div class="course_content">
-<p>{% trans "No document" %}</p>
-</div>
-{% endif %}
+        {% block media %}
+        {% with course as course %}
+        {% include "teleforma/inc/media_list.html" %}
+        {% endwith %}
+        {% endblock %}
 
-</div>
+        </div>
+{% endfor %}
+{% endfor %}
+{% endfor %}
 </div>
 {% endblock course %}
 

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

diff --git a/teleforma/views.py b/teleforma/views.py
index 2c7d169eb3c2a64a057abe0d35701f172b265b8d..9604e9d0bda10fceec6e8261efd7aabdafd4903c 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -84,6 +84,7 @@ def get_courses(user):
         courses = None
     return courses
 
+
 def stream_from_file(__file):
     chunk_size = 0x10000
     f = open(__file, 'r')
@@ -130,8 +131,15 @@ class CourseView(DetailView):
 
     def get_context_data(self, **kwargs):
         context = super(CourseView, self).get_context_data(**kwargs)
-        context['courses'] = get_courses(self.request.user)
         course = self.get_object()
+        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'], 'types': c['types']})
+        context['courses'] = courses
+        context['all_courses'] = all_courses
         context['notes'] = course.notes.all().filter(author=self.request.user)
         content_type = ContentType.objects.get(app_label="teleforma", model="course")
         context['room'] = get_room(name=course.title, content_type=content_type,
@@ -153,7 +161,6 @@ class CoursesView(ListView):
 
     def get_context_data(self, **kwargs):
         context = super(CoursesView, self).get_context_data(**kwargs)
-        context['courses'] = self.object_list
         context['notes'] = Note.objects.filter(author=self.request.user)
         context['room'] = get_room(name='site')
         return context