Add check for deleted session when scheduling. Fixes #2450. Commit re…

…ady for merge - Legacy-Id: 14842
ietf-tools · Mar 17, 2018 · 7211cf3 · 7211cf3
1 parent 49f00b7
commit 7211cf3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/ietf/meeting/ajax.py b/ietf/meeting/ajax.py
@@ -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"])

diff --git a/ietf/static/ietf/js/agenda/agenda_objects.js b/ietf/static/ietf/js/agenda/agenda_objects.js
@@ -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;