Skip to content

Commit e0ca40b

Browse files
committed
Merged in [14842] from rcross@amsl.com:
Add check for deleted session when scheduling. Fixes ietf-tools#2450. - Legacy-Id: 14847 Note: SVN reference [14842] has been migrated to Git commit 7211cf3
2 parents 63c97ad + 7211cf3 commit e0ca40b

2 files changed

Lines changed: 12 additions & 0 deletions

File tree

ietf/meeting/ajax.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -455,6 +455,13 @@ def assignments_post(request, meeting, schedule):
455455
status = 406,
456456
content_type="application/json")
457457

458+
try:
459+
Session.objects.get(pk=newvalues["session_id"])
460+
except Session.DoesNotExist:
461+
return HttpResponse(json.dumps({'error':'session has been deleted'}),
462+
status = 406,
463+
content_type="application/json")
464+
458465
ss1 = SchedTimeSessAssignment(schedule = schedule,
459466
session_id = newvalues["session_id"],
460467
timeslot_id = newvalues["timeslot_id"])

ietf/static/ietf/js/agenda/agenda_objects.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -482,6 +482,11 @@ ScheduledSlot.prototype.saveit = function() {
482482
session.placed(myss.timeslot);
483483
}
484484
});
485+
saveit.fail(function(jqXHR, textStatus) {
486+
var xhr = JSON.parse(jqXHR.responseText);
487+
alert("ERROR: " + xhr.error + "\nThe schedule will now reload.");
488+
location.reload(true);
489+
});
485490

486491
// return the promise, in case someone (tests!) needs to know when we are done.
487492
return saveit;

0 commit comments

Comments
 (0)