Field_session_timeslot and Tracks don't appear correctly with og_group_ref

Sorry to hijack the thread... Keeping this closed, just adding some notes for people coming here via Google.

This definitely applies to older, alpha builds of COD... But may apply to newer builds. It may have been resolved by the commits above, I don't know. In any event...

If you're getting an "illegal choice" error on your session timeslot field (specifically, after someone triggers an AJAX form submit via a file upload field, or by adding more speakers, etc)... The root cause is that the cod_session_timeslot View, which is used to define the available options for the entity reference field, attempts to pull contextual filter values for the node ID and OG reference group from the content URL and OG context (respectively).

Because the form submit is triggered and handled in an AJAX context (at a path like file/ajax or system/ajax), the View is unable to get the appropriate values from context, and thus returns an empty list of options for the timeslot field. The submitted value (whatever's selected on the node) is validated against the empty option set, and fails.

There are basically two ways to handle this... The first is to fiddle with the contextual filters in the cod_session_timeslot View to be able to pull the necessary values correctly (there may be patches for OG to handle the OG context issue; the node ID would probably require custom code or use of PHP filter). The second, and the route I decided to take, was to manually repopulate the session timeslot options in a form alter. Sample code below:

function MY_MODULE_form_alter(&$form, $form_state) {
  // Tweak this condition to your liking...
  if ($form['#node_edit_form'] && arg(1) == 'ajax')
    $field_name = 'field_session_timeslot';
    $node = $form[$field_name][LANGUAGE_NONE]['#entity'];
    // This is the node ID of the relevant event group; edit accordingly.
    $og = 1;

    // Load the field/instance so we can get at the entity reference handler.
    $field = field_info_field($field_name);
    $instance = field_info_instance('node', $field_name, $node->type);

    // The Views handler attempts (and fails) to get contextual info, so we
    // provide it here (currently takes the node ID + the relevant OG.
    $field['settings']['handler_settings']['view']['args'] = array($node->nid, $og);

    // Return the handler and get the options list.
    $handler = entityreference_get_selection_handler($field, $instance, 'node', $node);
    $options = $handler->getReferencableEntities();

    // Set the options list and ensure it's marked for multiple selections.
    $form[$field_name][LANGUAGE_NONE]['#options'] = $options;
    $form[$field_name][LANGUAGE_NONE]['#multiple'] = TRUE;
  }
}

Anyone know if this has been fixed in the latest COD distro?