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

Merged [7174] from rcross@amsl.com:

Browse source 
fix build_nonsession for new db schema, and path to roles ajax call
 - Legacy-Id: 7179
Note: SVN reference [7174] has been migrated to Git commit 7e38c4becd
This commit is contained in:
Henrik Levkowetz 2014-01-28 21:17:07 +00:00
parent a07e2cfbc3 7e38c4becd
commit 78b09b0c4e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -106,7 +106,7 @@ def build_nonsession(meeting):
last_meeting = get_last_meeting(meeting)
delta = meeting.date - last_meeting.date
system = Person.objects.get(name='(system)')
schedule = get_schedule(request, meeting)
schedule = get_schedule(meeting)
for slot in TimeSlot.objects.filter(meeting=last_meeting,type__in=('break','reg','other','plenary')):
new_time = slot.time + delta
@ -115,8 +115,8 @@ def build_nonsession(meeting):
if slot.type.slug in ('other','plenary'):
session = Session(meeting=meeting,
name=slot.name,
short=slot.session.short,
group=slot.session.group,
short=get_session(slot).short,
group=get_session(slot).group,
requested_by=system,
status_id='sched')
session.save()

2
ietf/secr/templates/roles/main.html
View file

@ -15,7 +15,7 @@
});
$('#id_group').change(function(){
var loadUrl = "/roles/ajax/get-roles/" + $(this).val() + "/";
var loadUrl = "/secr/roles/ajax/get-roles/" + $(this).val() + "/";
var ajax_load = "<img class='loading' src='{{ SECR_STATIC_URL }}img/ajax-loader.gif' alt='loading...' />";
var text = $(this).val();
$("#id_group_acronym").val(text);