Fix use of status still referring to the old attribute in the group

meeting page
 - Legacy-Id: 17142

Author: OleLaursen

ietf/doc/views_doc.py

@@ -1349,10 +1349,6 @@ def all_presentations(request, name):
         doc.session_set.filter(type__in=['regular','plenary','other'])
     ).filter(current_status__in=['sched','schedw','appr','canceled'])
 
-    status_names = {n.slug: n.name for n in SessionStatusName.objects.all()}
-    for session in sessions:
-        session.current_status_name = status_names.get(session.current_status, session.current_status)
-
     future, in_progress, past = group_sessions(sessions)
 
     return render(request, 'doc/material/all_presentations.html', {

ietf/meeting/utils.py

@@ -19,6 +19,7 @@
 from ietf.meeting.models import Session, Meeting, SchedulingEvent, TimeSlot
 from ietf.group.models import Group
 from ietf.group.utils import can_manage_materials
+from ietf.name.models import SessionStatusName
 from ietf.person.models import Email
 from ietf.secr.proceedings.proc_utils import import_audio_files
 
@@ -51,9 +52,10 @@ def current_session_status(session):
 
 
 def group_sessions(sessions):
-
+    status_names = {n.slug: n.name for n in SessionStatusName.objects.all()}
     for s in sessions:
         s.time = session_time_for_sorting(s, use_meeting_date=True)
+        s.current_status_name = status_names.get(s.current_status, s.current_status)
 
     sessions = sorted(sessions,key=lambda s:s.time)
 

ietf/templates/group/meetings-row.html

@@ -22,13 +22,13 @@
 	   {% endifchanged %}
 	 </td>
          <td class="text-right">
-           {% if s.name %}{{ s.name }}<br>{% endif %}
-           {% if s.status.slug == "sched" %}
-	   {{s.time|date:"D"}} &nbsp; {{s.time|date:"Y-m-d"}}
+          {% if s.name %}{{ s.name }}<br>{% endif %}
+          {% if s.current_status == "sched" %}
+	     {{s.time|date:"D"}} &nbsp; {{s.time|date:"Y-m-d"}}
           {% else %}
-            {{s.status}}
+             {{s.current_status_name}}
           {% endif %}
-          {% if show_request and s.meeting.type.slug == 'ietf' %}
+          {% if show_request and s.meeting.type_id == 'ietf' %}
              {% if can_edit %}
                <br>
                <a class="btn btn-default btn-xs" href="{% url 'ietf.secr.sreq.views.view' num=s.meeting.number acronym=s.group.acronym %}">Edit Session Request</a>
@@ -37,7 +37,7 @@
          </td>
 	 <td class="text-left padded-left ">
 	   {% if show_ical %}
-	     {% if s.meeting.type.slug == 'ietf' %}
+             {% if s.meeting.type_id == 'ietf' %}
 	     {{s.time|date:"H:i"}}
 	     &nbsp;<a href="{% url 'ietf.meeting.views.ical_agenda' num=s.meeting.number session_id=s.id %}"><span class="fa fa-calendar"></span></a>
 	     {% else %}