From 947f174e78d232220c6b44a227abe37e8d1ddd23 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Mon, 12 May 2014 19:37:44 +0000 Subject: [PATCH] Extended ScheduledSession objects were not initialized correctly, so un-extending did not work. Fixes bug #1401. Commit ready for merge. - Legacy-Id: 7732 --- static/js/agenda/agenda_helpers.js | 2 +- static/js/agenda/agenda_listeners.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/static/js/agenda/agenda_helpers.js b/static/js/agenda/agenda_helpers.js index c132496a0..7f0ce96f4 100644 --- a/static/js/agenda/agenda_helpers.js +++ b/static/js/agenda/agenda_helpers.js @@ -77,7 +77,7 @@ function style_empty_slots(){ } -var __debug_load_events = false; +var __debug_load_events = true; /* this pushes every event into the agendas */ function load_events(){ var slot_id; diff --git a/static/js/agenda/agenda_listeners.js b/static/js/agenda/agenda_listeners.js index 5f17dac30..ef4fdfd42 100644 --- a/static/js/agenda/agenda_listeners.js +++ b/static/js/agenda/agenda_listeners.js @@ -308,7 +308,7 @@ function extend_slot(event) { // need to create new scheduledsession var new_ss = make_ss({ "session_id" : session.session_id, "timeslot_id": slot.following_timeslot.timeslot_id, - "extended_from_id" : current_scheduledslot.scheduledsession_id}); + "extendedfrom_id" : current_scheduledslot.scheduledsession_id}); // make_ss also adds to slot_status. new_ss.saveit();