Skip to content

Commit 00de9c5

Browse files
author
Michael Lee
committed
Resove ticket 136, getting correct last update date from db
 - Legacy-Id: 562
1 parent 37c8d54 commit 00de9c5

3 files changed

Lines changed: 5 additions & 4 deletions

File tree

‎ietf/meeting/views.py‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Create your views here.
22
#import models
33
from django.shortcuts import render_to_response as render, get_object_or_404
4-
from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, NonSession, MeetingVenue, IESGHistory, Proceeding
4+
from ietf.proceedings.models import Meeting, MeetingTime, WgMeetingSession, NonSession, MeetingVenue, IESGHistory, Proceeding, Switches
55
from django.views.generic.list_detail import object_list
66
from django.http import Http404
77
from django.db.models import Q
@@ -37,6 +37,7 @@ def show_html_agenda(request, meeting_num=None, html_or_txt=None):
3737
meeting_info=get_object_or_404(Meeting, meeting_num=meeting_num)
3838
nonsession_info=NonSession.objects.filter(meeting=meeting_num,day_id__gte='0').order_by("day_id")
3939
meetingvenue_info=get_object_or_404(MeetingVenue, meeting_num=meeting_num)
40+
last_update_info=get_object_or_404(Switches,id=1)
4041
plenaryt_agenda_file = "/home/master-site/proceedings/%s" % WgMeetingSession.objects.get(meeting=meeting_num,group_acronym_id=-2).agenda_file()
4142
try:
4243
f = open(plenaryt_agenda_file)
@@ -67,5 +68,5 @@ def show_html_agenda(request, meeting_num=None, html_or_txt=None):
6768
queryset_list_sun.sort(key=(lambda item: item.sched_time_id1.time_desc))
6869
queryset_list_ads = list(IESGHistory.objects.filter(meeting=meeting_num))
6970
queryset_list_ads.sort(key=(lambda item: item.area.area_acronym.acronym))
70-
return object_list(request,queryset=queryset_list, template_name=template_file,allow_empty=True, extra_context={'qs_sun':queryset_list_sun, 'meeting_info':meeting_info, 'meeting_num':meeting_num, 'nonsession_info':nonsession_info, 'meetingvenue_info':meetingvenue_info, 'plenaryw_agenda':plenaryw_agenda, 'plenaryt_agenda':plenaryt_agenda, 'qs_ads':queryset_list_ads})
71+
return object_list(request,queryset=queryset_list, template_name=template_file,allow_empty=True, extra_context={'qs_sun':queryset_list_sun, 'meeting_info':meeting_info, 'meeting_num':meeting_num, 'nonsession_info':nonsession_info, 'meetingvenue_info':meetingvenue_info, 'plenaryw_agenda':plenaryw_agenda, 'plenaryt_agenda':plenaryt_agenda, 'qs_ads':queryset_list_ads,'last_update_info':last_update_info})
7172

‎ietf/templates/meeting/agenda.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<center>
88
<strong> Agenda of the {{ meeting_num|ordinal }} IETF Meeting </strong> <br/>
99
<strong>{{ meeting_info.start_date|date:"F j" }}-{% ifnotequal meeting_info.start_date|date:"F" meeting_info.end_date|date:"F" %}{{ meeting_info.end_date|date:"F " }}{% endifnotequal %}{{ meeting_info.end_date|date:"j, Y" }} </strong><br />
10-
Updated as of {% now "F j, Y, H:i:s (T)" %}
10+
Updated as of {{ last_update_info.updated_date }} {{ last_update_info.updated_time }} (ET)
1111
</center>
1212

1313
(<a href="http://www3.ietf.org//meetings/agenda_{{meeting_num}}.txt"> Text Format of the Agenda </a>) <br />

‎ietf/templates/meeting/agenda.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ xml:lang="en-US"><head><title>Agenda of the {{ meeting_num|ordinal }} IETF Meeti
1010
{% filter center:72 %}Agenda of the {{ meeting_num|ordinal }} IETF Meeting{% endfilter %}
1111
{% filter center:72 %}{{ meeting_info.start_date|date:"F j" }}-{% ifnotequal meeting_info.start_date|date:"F" meeting_info.end_date|date:"F" %}{{ meeting_info.end_date|date:"F " }}{% endifnotequal %}{{ meeting_info.end_date|date:"j, Y" }}{% endfilter %}
1212

13-
Updated as of {% now "F j, Y, H:i:s (T)" %}
13+
Updated as of {{ last_update_info.updated_date }} {{ last_update_info.updated_time }} (ET)
1414

1515
{{ meeting_info.start_date|date:"l"|upper }}, {{ meeting_info.start_date|date:"F j, Y" }}
1616
{{ nonsession_info.0.time_desc }} {{ nonsession_info.0.non_session_ref }} - {{ meetingvenue_info.reg_area_name }}

0 commit comments

Comments
 (0)