altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 6 Packages Projects Releases Wiki Activity

Fix some bugs in materials page after meeting refactor

Browse source 
- Legacy-Id: 3772
This commit is contained in:
Ole Laursen 2011-12-14 17:28:54 +00:00
parent d81f00b760
commit 2d521ee92b
2 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/meeting/proxy.py
View file

@ -445,7 +445,7 @@ class WgMeetingSessionProxy(TimeSlot):
def area_name(self):
if self.type_id == "plenary":
return "Plenary Sessions"
elif self.type_id == "other":
elif self.session and self.session.group and self.session.group.acronym == "edu":
return "Training"
elif not self.session or not self.session.group or not self.session.group.parent or not self.session.group.parent.type_id == "area":
return ""

27
ietf/meeting/views.py
View file

@ -47,21 +47,32 @@ def show_html_materials(request, meeting_num=None):
sub_began = 1
# List of WG sessions and Plenary sessions
if settings.USE_DB_REDESIGN_PROXY_CLASSES:
seen_materials = set()
queryset_list = []
queryset_irtf = []
queryset_interim = [] # currently ignored, have no way of handling interim here
queryset_training = []
for item in WgMeetingSession.objects.filter(meeting=meeting_num):
if item.type_id in ("session", "plenary"):
if item.session and item.session.group and item.session.group.type_id == "rg":
queryset_irtf.append(item)
else:
queryset_list.append(item)
else:
if item.type_id == "other" and item.slides():
if not item.session or not item.session.group:
continue
if item.session.group.type_id == "rg":
queryset_irtf.append(item)
elif item.session.group.acronym == "edu":
if item.slides():
queryset_training.append(item)
else:
if item.session.name and not item.slides():
continue
t = tuple(x.pk for x in item.session.materials.all())
if t and t in seen_materials:
continue
seen_materials.add(t)
queryset_list.append(item)
from redesign.doc.models import Document
cache_version = Document.objects.filter(timeslot__meeting__number=meeting_num).aggregate(Max('time'))["time__max"]
cache_version = Document.objects.filter(session__meeting__number=meeting_num).aggregate(Max('time'))["time__max"]
else:
queryset_list = WgMeetingSession.objects.filter(Q(meeting=meeting_num, group_acronym_id__gte = -2, status__id=4), Q(irtf__isnull=True) | Q(irtf=0))
queryset_irtf = WgMeetingSession.objects.filter(meeting=meeting_num, group_acronym_id__gte = -2, status__id=4, irtf__gt=0)