Provide a correct link to jabber logs for plenaries in past agendas. Fixes ietf-tools#2641. Commit ready for merge.

 - Legacy-Id: 15816

Author: rjsparks

ietf/meeting/models.py

@@ -1137,6 +1137,14 @@ def agenda_file(self):
 
         return self._agenda_file
 
+    def jabber_room_name(self):
+        if self.type_id=='plenary':
+            return 'plenary'
+        elif self.historic_group:
+            return self.historic_group.acronym
+        else:
+            return self.group.acronym
+
 class ImportantDate(models.Model):
     meeting = ForeignKey(Meeting)
     date = models.DateField()

ietf/templates/meeting/session_buttons_include.html

@@ -17,17 +17,10 @@
 		      {# show stream buttons up till end of session, then show archive buttons #}
 		      {% if now < item.timeslot.end_time %}
 		        <!-- Jabber -->
-			{% if item.timeslot.type.slug == 'plenary' %}
 			  <a class="btn btn-default btn-xs"
-			    href="xmpp:plenary@jabber.ietf.org?join"
-			    title="Jabber room for {{item.timeslot.name}}"><span class="fa fa-lightbulb-o"></span>
+			    href="xmpp:{{item.session.jabber_room_name}}@jabber.ietf.org?join"
+			    title="Jabber room for {{item.session.jabber_room_name}}"><span class="fa fa-lightbulb-o"></span>
 			  </a>
-			{% else %}
-			  <a class="btn btn-default btn-xs"
-			    href="xmpp:{{item.session.historic_group.acronym}}@jabber.ietf.org?join"
-			    title="Jabber room for {{item.session.historic_group.acronym}}"><span class="fa fa-lightbulb-o"></span>
-			  </a>
-			{% endif %}
 
 			<!-- Video stream (meetecho) -->
 			{% if item.timeslot.location.video_stream_url %}
@@ -47,8 +40,8 @@
 		        <!-- Jabber logs -->
 			{% if schedule.meeting.number|add:"0" >= 60 %}
 		        <a class="btn btn-default btn-xs"
-			  href="https://www.ietf.org/jabber/logs/{{item.session.historic_group.acronym}}"
-			  title="Jabber logs for {{item.session.historic_group.acronym}}">
+			  href="https://www.ietf.org/jabber/logs/{{item.session.jabber_room_name}}"
+			  title="Jabber logs for {{item.session.jabber_room_name}}">
 			   <span class="fa fa-stack">
 			     <i class="fa fa-file-o fa-stack-1x"></i>
 			     <i class="fa fa-lightbulb-o fa-stack-1x"></i>