From a12be8aeb5bc23e51ee6f075047442880ff1b33b Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Mon, 6 Oct 2014 21:40:54 +0000
Subject: [PATCH] Removes a modify-while-iterating error, and removes a bug
 where two different bits of code thought they were responsible for deleting
 things from a global list. Fixes bug #1498. Commit ready for merge.  -
 Legacy-Id: 8377

---
 static/js/agenda/agenda_listeners.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/static/js/agenda/agenda_listeners.js b/static/js/agenda/agenda_listeners.js
index d6151fbc9..e36fa4876 100644
--- a/static/js/agenda/agenda_listeners.js
+++ b/static/js/agenda/agenda_listeners.js
@@ -1009,23 +1009,20 @@ function update_from_slot(session_id, from_slot_id)
     if(from_slot_id != null && from_scheduledslots != undefined){
         //console.log("1 from_slot_id", from_slot_id, from_scheduledslots);
         var count = from_scheduledslots.length;
-        var found = false;
+        var found = [];
 	for(var k = 0; k<from_scheduledslots.length; k++) {
             var from_ss = from_scheduledslots[k];
 	    if(from_ss.session_id == session_id){
-                found = true;
-
-                var promise = from_ss.deleteit();
-                delete_promises.push(promise);
-                from_scheduledslots.splice(k,1);
-                count--;
+                found.push(from_ss)
 	    }
 	}
-        if(found && count == 0) {
-            from_timeslot.mark_empty();
-        } else {
-            console.log("not setting fromslot empty", from_timeslot, count, found, session_id, "from_slot_id", from_slot_id);
+        for (var k = 0; k<found.length; k++) {
+           // This will affect agenda_globals.slot_status[from_slot_id], hence from_scheduledslots
+           delete_promises.push(found[k].deleteit()); 
         }
+        if (from_scheduledslots.length==0){
+            from_timeslot.mark_empty();
+        } 
 
         /* remove undefined entries */
         new_fromslots = [];