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

Added 'remote_instructions' as an editable field for misc. sessions in the secretariat app, in order to be able to set remote access URLs.

Browse source 
- Legacy-Id: 18118
This commit is contained in:
Henrik Levkowetz 2020-07-01 14:14:05 +00:00
parent ae5de75b65
commit 129d62e666
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ietf/secr/meetings/forms.py
View file

@ -166,6 +166,7 @@ class MiscSessionForm(TimeSlotForm):
Plenary = IETF''', Plenary = IETF''',
required=False) required=False)
location = forms.ModelChoiceField(queryset=Room.objects, required=False) location = forms.ModelChoiceField(queryset=Room.objects, required=False)
remote_instructions = forms.CharField(max_length=255)
show_location = forms.BooleanField(required=False) show_location = forms.BooleanField(required=False)
def __init__(self,*args,**kwargs): def __init__(self,*args,**kwargs):

2
ietf/secr/meetings/tests.py
View file

@ -289,6 +289,7 @@ class SecrMeetingTestCase(TestCase):
'type':'reg', 'type':'reg',
'group':group.pk, 'group':group.pk,
'location': room.pk, 'location': room.pk,
'remote_instructions': 'http://webex.com/foobar',
}) })
self.assertRedirects(response, url) self.assertRedirects(response, url)
session = Session.objects.filter(meeting=meeting, name='Testing').first() session = Session.objects.filter(meeting=meeting, name='Testing').first()
@ -332,6 +333,7 @@ class SecrMeetingTestCase(TestCase):
'duration':'01:00', 'duration':'01:00',
'day':'2', 'day':'2',
'type':'other', 'type':'other',
'remote_instructions': 'http://webex.com/foobar',
}) })
self.assertRedirects(response, redirect_url) self.assertRedirects(response, redirect_url)
timeslot = session.official_timeslotassignment().timeslot timeslot = session.official_timeslotassignment().timeslot

6
ietf/secr/meetings/views.py
View file

@ -523,6 +523,7 @@ def misc_session_edit(request, meeting_id, schedule_name, slot_id):
duration = form.cleaned_data['duration'] duration = form.cleaned_data['duration']
slot_type = form.cleaned_data['type'] slot_type = form.cleaned_data['type']
show_location = form.cleaned_data['show_location'] show_location = form.cleaned_data['show_location']
remote_instructions = form.cleaned_data['remote_instructions']
time = get_timeslot_time(form, meeting) time = get_timeslot_time(form, meeting)
slot.location = location slot.location = location
slot.name = name slot.name = name
@ -535,6 +536,7 @@ def misc_session_edit(request, meeting_id, schedule_name, slot_id):
session.group = group session.group = group
session.name = name session.name = name
session.short = short session.short = short
session.remote_instructions = remote_instructions
session.save() session.save()
messages.success(request, 'Location saved') messages.success(request, 'Location saved')
@ -552,7 +554,9 @@ def misc_session_edit(request, meeting_id, schedule_name, slot_id):
'time':slot.time.strftime('%H:%M'), 'time':slot.time.strftime('%H:%M'),
'duration':duration_string(slot.duration), 'duration':duration_string(slot.duration),
'show_location':slot.show_location, 'show_location':slot.show_location,
'type':slot.type} 'type':slot.type,
'remote_instructions': session.remote_instructions,
}
form = MiscSessionForm(initial=initial, meeting=meeting, session=session) form = MiscSessionForm(initial=initial, meeting=meeting, session=session)
return render(request, 'meetings/misc_session_edit.html', { return render(request, 'meetings/misc_session_edit.html', {