Merged in [10338] from rcross@amsl.com:

Fixes Ticket #1806.  Legacy session scheduling view broken.
 - Legacy-Id: 10350
Note: SVN reference [10338] has been migrated to Git commit 67e1678b13
This commit is contained in:
Henrik Levkowetz 2015-10-31 13:21:49 +00:00
commit a1b417576b
2 changed files with 14 additions and 4 deletions

View file

@ -46,7 +46,7 @@ def get_times(meeting,day):
The label is [start_time]-[end_time].
'''
# pick a random room
rooms = Room.objects.filter(meeting=meeting)
rooms = Room.objects.filter(meeting=meeting,session_types='session')
if rooms:
room = rooms[0]
else:

View file

@ -11,6 +11,7 @@ from ietf.group.models import Group, GroupEvent
from ietf.meeting.models import Meeting, Room, TimeSlot, SchedTimeSessAssignment
from ietf.meeting.test_data import make_meeting_test_data
from ietf.person.models import Person
from ietf.secr.meetings.forms import get_times
from ietf.utils.mail import outbox
from ietf.utils.test_utils import TestCase
@ -244,6 +245,15 @@ class MainTestCase(TestCase):
self.assertEqual(response.status_code, 200)
q = PyQuery(response.content)
self.assertEqual(len(q("#id_scheduled_sessions")),1)
# def test_meetings_schedule():
# ----------------------
# Unit Tests
# -----------------------
def test_get_times(self):
meeting = make_meeting_test_data()
timeslot = meeting.timeslot_set.filter(type='session').first()
day = timeslot.time.weekday() + 2 # add 2 to match django __week_day filter
times = get_times(meeting,day)
values = [ x[0] for x in times ]
self.assertTrue(times)
self.assertTrue(timeslot.time.strftime('%H%M') in values)