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

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

Browse source 
Add check for deleted session when scheduling.  Fixes #2450.
 - Legacy-Id: 14847
Note: SVN reference [14842] has been migrated to Git commit 7211cf399b
This commit is contained in:
Henrik Levkowetz 2018-03-17 16:01:26 +00:00
parent 63c97ad439 7211cf399b
commit e0ca40bdf2
2 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ietf/meeting/ajax.py
View file

@ -455,6 +455,13 @@ def assignments_post(request, meeting, schedule):
status = 406,
content_type="application/json")
try:
Session.objects.get(pk=newvalues["session_id"])
except Session.DoesNotExist:
return HttpResponse(json.dumps({'error':'session has been deleted'}),
status = 406,
content_type="application/json")
ss1 = SchedTimeSessAssignment(schedule = schedule,
session_id = newvalues["session_id"],
timeslot_id = newvalues["timeslot_id"])

5
ietf/static/ietf/js/agenda/agenda_objects.js
View file

@ -482,6 +482,11 @@ ScheduledSlot.prototype.saveit = function() {
session.placed(myss.timeslot);
}
});
saveit.fail(function(jqXHR, textStatus) {
var xhr = JSON.parse(jqXHR.responseText);
alert("ERROR: " + xhr.error + "\nThe schedule will now reload.");
location.reload(true);
});
// return the promise, in case someone (tests!) needs to know when we are done.
return saveit;