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

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

Browse source 
Fixes Ticket #1794.  The session request form validation needs to check that durations have been entered for each requested session.
 - Legacy-Id: 10355
Note: SVN reference [10342] has been migrated to Git commit d130d06948
This commit is contained in:
Henrik Levkowetz 2015-10-31 23:40:48 +00:00
parent 92e0178a9a d130d06948
commit 7baf20ca76
2 changed files with 25 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ietf/secr/sreq/forms.py
View file

@ -121,13 +121,13 @@ class SessionForm(forms.Form):
# verify session_length and num_session correspond
# if default (empty) option is selected, cleaned_data won't include num_session key
if data.get('num_session','') == 2:
if data.get('num_session','') == '2':
if not data['length_session2']:
raise forms.ValidationError('You must enter a length for session 2')
raise forms.ValidationError('You must enter a length for all sessions')
if data.get('third_session',False):
if not data.get('length_session3',None):
raise forms.ValidationError('Length of third session not selected')
if not data['length_session2'] or not data.get('length_session3',None):
raise forms.ValidationError('You must enter a length for all sessions')
return data

35
ietf/secr/sreq/tests.py
View file

@ -44,23 +44,30 @@ class SubmitRequestCase(TestCase):
make_test_data()
acronym = Group.objects.all()[0].acronym
url = reverse('sessions_new',kwargs={'acronym':acronym})
post_data = {'id_num_session':'1',
'id_length_session1':'3600',
'id_attendees':'10',
'id_conflict1':'',
'id_comments':'need projector'}
post_data = {'num_session':'1',
'length_session1':'3600',
'attendees':'10',
'conflict1':'',
'comments':'need projector'}
self.client.login(username="secretary", password="secretary+password")
r = self.client.post(url,post_data)
self.assertEqual(r.status_code, 302)
def test_submit_request_invalid(self):
make_test_data()
group = Group.objects.filter(type='wg').first()
url = reverse('sessions_new',kwargs={'acronym':group.acronym})
post_data = {'num_session':'2',
'length_session1':'3600',
'attendees':'10',
'conflict1':'',
'comments':'need projector'}
self.client.login(username="secretary", password="secretary+password")
r = self.client.post(url,post_data)
self.assertEqual(r.status_code, 200)
"""
#assert False, self.client.session..__dict__
url = reverse('sessions_confirm',kwargs={'acronym':acronym})
#s = self.client.session
#s['session_form'] = post_data
r = self.client.get(url)
assert False, r.content
"""
q = PyQuery(r.content)
self.assertEqual(len(q('#session-request-form')),1)
self.assertTrue('You must enter a length for all sessions' in r.content)
class LockAppTestCase(TestCase):
def test_edit_request(self):