show all speakers of a presentation

symposion/schedule/models.py

@@ -117,7 +117,7 @@ class Presentation(models.Model):
     description = MarkupField()
     abstract = MarkupField()
     speaker = models.ForeignKey("speakers.Speaker", related_name="presentations")
-    additional_speakers = models.ManyToManyField("speakers.Speaker", blank=True)
+    additional_speakers = models.ManyToManyField("speakers.Speaker", related_name="copresentations", blank=True)
     cancelled = models.BooleanField(default=False)
     proposal_base = models.OneToOneField(ProposalBase, related_name="presentation")
     section = models.ForeignKey(Section, related_name="presentations")

symposion/speakers/models.py

@@ -42,3 +42,13 @@ class Speaker(models.Model):
             return self.user.email
         else:
             return self.invite_email
+    
+    @property
+    def all_presentations(self):
+        presentations = []
+        if self.presentations:
+            for p in self.presentations.all():
+                presentations.append(p)
+            for p in self.copresentations.all():
+                presentations.append(p)
+        return presentations

symposion/speakers/views.py

@@ -126,10 +126,11 @@ def speaker_edit(request, pk=None):
 
 def speaker_profile(request, pk):
     speaker = get_object_or_404(Speaker, pk=pk)
-    
+    presentations = speaker.all_presentations
-    if not speaker.presentations and not request.user.is_staff:
+    if not presentations and not request.user.is_staff:
         raise Http404()
     
     return render(request, "speakers/speaker_profile.html", {
         "speaker": speaker,
+        "presentations": presentations,
     })

symposion/templates/schedule/presentation_detail.html

@@ -1,33 +1,30 @@
 {% extends "site_base.html" %}
 
+{% load sitetree %}
+
 {% block head_title %}Presentation: {{ presentation.title }}{% endblock %}
 
+{% block breadcrumbs %}{% sitetree_breadcrumbs from "main" %}{% endblock %}
+
 {% block body %}
+    {% if presentation.slot %}
+        <h4>
+            {{ presentation.slot.day.date|date:"l" }}
+            {{ presentation.slot.start}}&ndash;{{ presentation.slot.end }}
+        </h4>
+    {% endif %}
+    <h2>{{ presentation.title }}</h2>
 
-    <h1>{{ presentation.title }}</h1>
+    <h4>
-
-    <h2>
         {% for speaker in presentation.speakers %}
-            <a href="{% url speaker_profile speaker.pk %}">{{ speaker }}</a>
+            <a href="{% url speaker_profile speaker.pk %}">{{ speaker }}</a>{% if not forloop.last %}, {% endif %}{% endfor %}
-        {% if not forloop.last %}, {% endif %}{% endfor %}
+    </h4>
-    </h2>
 
     <dl class="dl-horizontal">
         <dt>Audience level:</dt>
         <dd style="margin-bottom: 0;">{{ presentation.proposal.get_audience_level_display }}</dd>
-        <dt>Track:</dt>
-        <dd>{{ presentation.proposal.track }}</dd>
     </dl>
 
-    {% if presentation.slot %}
-        <h2>
-            {{ presentation.slot.day.date|date:"l" }}
-            {{ presentation.slot.start}}&ndash;{{ presentation.slot.end }}
-            in
-            {{ presentation.slot.rooms|join:", " }}
-        </h2>
-    {% endif %}
-
     <h3>Description</h3>
 
     <div class="description">{{ presentation.description }}</div>

symposion/templates/speakers/speaker_profile.html

@@ -4,7 +4,7 @@
 {% load thumbnail %}
 
 
-{% block page_title %}{% endblock %}
+{% block head_title %}{{ speaker.name }}{% endblock %}
 
 {% block body %}
     <div class="row">
@@ -23,7 +23,7 @@
             <div class="bio">{{ speaker.biography|safe }}</div>
             
             <h2>Presentations</h2>
-            {% for presentation in speaker.presentations.all %}
+            {% for presentation in presentations %}
                 <h3><a href="{% url schedule_presentation_detail presentation.pk %}">{{ presentation.title }}</a></h3>
                 {% if presentation.slot %}
                     <p>