Fix issue where new non-session location field value isn't saved. Fixes ietf-tools#2625. Commit ready for merge.

 - Legacy-Id: 15715

Author: rpcross

ietf/secr/meetings/tests.py

@@ -15,7 +15,7 @@
 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 
+from ietf.utils.test_utils import TestCase
 
 
 class SecrMeetingTestCase(TestCase):
@@ -25,14 +25,14 @@ def setUp(self):
         settings.SECR_PROCEEDINGS_DIR = self.proceedings_dir
         self.saved_agenda_path = settings.AGENDA_PATH
         settings.AGENDA_PATH = self.proceedings_dir
-        
+
         self.bluesheet_dir = self.tempdir('bluesheet')
         self.bluesheet_path = os.path.join(self.bluesheet_dir,'blue_sheet.rtf')
         self.saved_secr_blue_sheet_path = settings.SECR_BLUE_SHEET_PATH
         settings.SECR_BLUE_SHEET_PATH = self.bluesheet_path
 
         self.materials_dir = self.tempdir('materials')
-        
+
     def tearDown(self):
         settings.SECR_PROCEEDINGS_DIR = self.saved_secr_proceedings_dir
         settings.AGENDA_PATH = self.saved_agenda_path
@@ -61,7 +61,7 @@ def test_view(self):
         self.assertEqual(response.status_code, 200)
         q = PyQuery(response.content)
         self.assertEqual(len(q('#id_schedule_selector option')),3)
-         
+
     def test_add_meeting(self):
         "Add Meeting"
         meeting = make_meeting_test_data()
@@ -85,7 +85,7 @@ def test_add_meeting(self):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(Meeting.objects.count(),count + 1)
         new_meeting = Meeting.objects.get(number=number)
-        
+
         # ensure new schedule is populated with specials sessions from previous meeting
         self.assertTrue(new_meeting.agenda)
         self.assertTrue(meeting.agenda.assignments.filter(timeslot__type='break').count() > 0)
@@ -129,12 +129,12 @@ def test_blue_sheets_upload(self):
         "Test Bluesheets"
         meeting = make_meeting_test_data()
         os.makedirs(os.path.join(self.proceedings_dir,str(meeting.number),'bluesheets'))
-        
+
         url = reverse('ietf.secr.meetings.views.blue_sheet',kwargs={'meeting_id':meeting.number})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        
+
         # test upload
         group = Group.objects.filter(type='wg',state='active').first()
         file = StringIO('dummy bluesheet')
@@ -152,7 +152,7 @@ def test_blue_sheets_generate(self):
         response = self.client.post(url)
         self.assertEqual(response.status_code, 302)
         self.assertTrue(os.path.exists(self.bluesheet_path))
-        
+
     def test_notifications(self):
         "Test Notifications"
         meeting = make_meeting_test_data()
@@ -162,7 +162,7 @@ def test_notifications(self):
         self.assertEqual(response.status_code, 200)
         q = PyQuery(response.content)
         self.assertEqual(q('#id_notification_list').html(),'ames, mars')
-        
+
         # test that only changes since last notification show up
         mars_group = Group.objects.get(acronym='mars')
         ames_group = Group.objects.get(acronym='ames')
@@ -179,21 +179,21 @@ def test_notifications(self):
         self.assertEqual(response.status_code, 200)
         q = PyQuery(response.content)
         self.assertEqual(q('#id_notification_list').html(),'ames')
-        
+
         # test that email goes out
         mailbox_before = len(outbox)
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.post(url)
         self.assertEqual(response.status_code, 302)
         self.assertEqual(len(outbox), mailbox_before + 1)
-        
+
     def test_meetings_select(self):
         make_meeting_test_data()
         url = reverse('ietf.secr.meetings.views.select',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-    
+
     def test_meetings_rooms(self):
         meeting = make_meeting_test_data()
         url = reverse('ietf.secr.meetings.views.rooms',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
@@ -202,7 +202,7 @@ def test_meetings_rooms(self):
         self.assertEqual(response.status_code, 200)
         q = PyQuery(response.content)
         self.assertEqual(len(q("#id_rooms_table tr input[type='checkbox']")),meeting.room_set.count())
-        
+
         # test delete
         # first unschedule sessions so we can delete
         SchedTimeSessAssignment.objects.filter(schedule=meeting.agenda).delete()
@@ -219,7 +219,7 @@ def test_meetings_rooms(self):
         response = self.client.post(url, post_dict)
         self.assertEqual(response.status_code, 302)
         self.assertEqual(Room.objects.filter(meeting=meeting).count(),0)
-        
+
     def test_meetings_times(self):
         make_meeting_test_data()
         url = reverse('ietf.secr.meetings.views.times',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
@@ -239,7 +239,7 @@ def test_meetings_times_delete(self):
         meeting = make_meeting_test_data()
         qs = TimeSlot.objects.filter(meeting=meeting,type='session')
         before = qs.count()
-        expected_deletion_count = qs.filter(time=qs.first().time).count() 
+        expected_deletion_count = qs.filter(time=qs.first().time).count()
         url = reverse('ietf.secr.meetings.views.times_delete',kwargs={
             'meeting_id':meeting.number,
             'schedule_name':meeting.agenda.name,
@@ -256,7 +256,7 @@ def test_meetings_times_delete(self):
         self.assertRedirects(response, redirect_url)
         after = TimeSlot.objects.filter(meeting=meeting,type='session').count()
         self.assertEqual(after,before - expected_deletion_count)
-        
+
     def test_meetings_times_edit(self):
         meeting = make_meeting_test_data()
         timeslot = TimeSlot.objects.filter(meeting=meeting,type='session').first()
@@ -274,14 +274,37 @@ def test_meetings_times_edit(self):
         })
         self.assertEqual(response.status_code, 302)
         self.assertTrue(TimeSlot.objects.filter(meeting=meeting,name='Testing'))
-        
+
     def test_meetings_nonsession(self):
         make_meeting_test_data()
         url = reverse('ietf.secr.meetings.views.non_session',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
         self.client.login(username="secretary", password="secretary+password")
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-    
+
+    def test_meetings_nonsession_add_valid(self):
+        meeting = make_meeting_test_data()
+        room = meeting.room_set.first()
+        group = Group.objects.get(acronym='secretariat')
+        url = reverse('ietf.secr.meetings.views.non_session',kwargs={'meeting_id':42,'schedule_name':'test-agenda'})
+        self.client.login(username="secretary", password="secretary+password")
+        response = self.client.post(url, {
+            'day':'1',
+            'time':'08:00',
+            'duration':'02:00',
+            'name':'Testing',
+            'short':'test',
+            'type':'reg',
+            'group':group.pk,
+            'location': room.pk,
+        })
+        print response.content
+        self.assertRedirects(response, url)
+        session = Session.objects.filter(meeting=meeting, name='Testing').first()
+        self.assertTrue(session)
+
+        self.assertEqual(session.timeslotassignments.first().timeslot.location, room)
+
     def test_meetings_nonsession_add_invalid(self):
         make_meeting_test_data()
         group = Group.objects.get(acronym='secretariat')
@@ -396,4 +419,3 @@ def test_get_times(self):
         values = [ x[0] for x in times ]
         self.assertTrue(times)
         self.assertTrue(timeslot.time.strftime('%H%M') in values)
-