From 4b3763dc4d826c859a97c32f2c5889a21c34789d Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Wed, 2 Jan 2013 22:58:16 +0100
Subject: [PATCH] fix professors count

---
 .../teleforma/inc/media_package_list.html         |  9 ++++++---
 .../templates/teleforma/seminar_media_audio.html  | 13 ++++++++-----
 .../templates/teleforma/seminar_media_video.html  | 15 +++++++++------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/teleforma/templates/teleforma/inc/media_package_list.html b/teleforma/templates/teleforma/inc/media_package_list.html
index 8dc7c612..dfbdd2a8 100644
--- a/teleforma/templates/teleforma/inc/media_package_list.html
+++ b/teleforma/templates/teleforma/inc/media_package_list.html
@@ -33,9 +33,12 @@
                 <div>
                     <dl class="listing" style="font-size: 1.2em;">
                     <dt>{% trans "Title" %}</dt><dd>{{ seminar.title }} - {{ seminar.sub_title }} - {{ media_package.rank }}</dd>
-                    {% if seminar.professor.all %}
-                    <dt>{% trans "Professor" %}</dt><dd>{% for professor in seminar.professor.all %}<a href="{% url telemeta-profile-detail professor.user.username %}" target="_blank">{{ professor }}</a> {% endfor %}</dd>
-                    {% endif %}
+                    {% with seminar.professor.all as professors %}
+                        {% if professors %}
+                            <dt>{% if professors.count > 1 %}{% trans "Professors" %}{% else %}{% trans "Professor" %}{% endif %}</dt>
+                            <dd>{% for professor in professors %}{{ professor }}{% if not forloop.last %},{% endif %} {% endfor %}</a></dd>
+                        {% endif %}
+                    {% endwith %}
                     {% if media.description %}
                     <dt>{% trans "Description" %}</dt><dd>{{ media.description }}</dd>
                     {% endif %}
diff --git a/teleforma/templates/teleforma/seminar_media_audio.html b/teleforma/templates/teleforma/seminar_media_audio.html
index 0fe009ac..02f1ce5f 100644
--- a/teleforma/templates/teleforma/seminar_media_audio.html
+++ b/teleforma/templates/teleforma/seminar_media_audio.html
@@ -53,11 +53,14 @@
 <dl class="listing">
 
 
-<dt>{% trans "Seminar" %}</dt><dd><a href="{% url teleforma-seminar-detail seminar.id %}">{{ seminar.title }} - {{ seminar.rank }}</a></dd>
-{% if seminar.professor.all %}
-<dt>{% trans "Professors" %}</dt>
-    <dd>{% for professor in seminar.professor.all %}<a href="{% url telemeta-profile-detail professor.user.username %}" target="_blank">{{ professor }}, {% endfor %}</a></dd>
-{% endif %}
+<dt>{% trans "Seminar" %}</dt><dd><a href="{% url teleforma-seminar-detail seminar.id %}">{{ seminar.title }} - {{ seminar.sub_title }} - {{ media_package.rank }}</a></dd>
+
+{% with seminar.professor.all as professors %}
+  {% if professors %}
+    <dt>{% if professors.count > 1 %}{% trans "Professors" %}{% else %}{% trans "Professor" %}{% endif %}</dt>
+    <dd>{% for professor in professors %}{{ professor }}{% if not forloop.last %},{% endif %} {% endfor %}</a></dd>
+  {% endif %}
+{% endwith %}
 
 {% if user.is_staff or user.is_superuser %}
 <dt>{% trans "Mime type" %}</dt><dd>{% for media in media_package.audio.all %}{{ media.mime_type }}, {% endfor %}</dd>
diff --git a/teleforma/templates/teleforma/seminar_media_video.html b/teleforma/templates/teleforma/seminar_media_video.html
index 097e6542..d9dfdc48 100644
--- a/teleforma/templates/teleforma/seminar_media_video.html
+++ b/teleforma/templates/teleforma/seminar_media_video.html
@@ -101,12 +101,15 @@ $(window).ready(function(){
 <dl class="listing">
 
 
-<dt>{% trans "Seminar" %}</dt><dd><a href="{% url teleforma-seminar-detail seminar.id %}">{{ seminar.title }} - {{ seminar.rank }}</a></dd>
-{% if seminar.professor.all %}
-<dt>{% trans "Professors" %}</dt>
-    <dd>{% for professor in seminar.professor.all %}<a href="{% url telemeta-profile-detail professor.user.username %}" target="_blank">{{ professor }}, {% endfor %}</a></dd>
-{% endif %}
-
+<dt>{% trans "Seminar" %}</dt><dd><a href="{% url teleforma-seminar-detail seminar.id %}">{{ seminar.title }} - {{ seminar.sub_title }} - {{ media_package.rank }}</a></dd>
+
+{% with seminar.professor.all as professors %}
+  {% if professors %}
+    <dt>{% if professors.count > 1 %}{% trans "Professors" %}{% else %}{% trans "Professor" %}{% endif %}</dt>
+    <dd>{% for professor in professors %}{{ professor }}{% if not forloop.last %},{% endif %} {% endfor %}</a></dd>
+  {% endif %}
+{% endwith %}
+                    
 {% if user.is_staff or user.is_superuser %}
 <dt>{% trans "Mime type" %}</dt><dd>{% for media in media_package.video.all %}{{ media.mime_type }}, {% endfor %}</dd>
 <dt>{% trans "Date added" %}</dt><dd>{{ media_package.date_added }}</dd>
-- 
2.39.5