|
@@ -12,10 +12,18 @@ function cer_settings_form($form = array(), &$form_state) {
|
|
|
$channels = array();
|
|
|
|
|
|
foreach (_cer_get_fields() as $field) {
|
|
|
+ // A field that hasn't been instantiated yet will not have a 'bundles' key, which
|
|
|
+ // means it's useless to us, so skip over it.
|
|
|
+ if (! isset($field['bundles'])) {
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
foreach ($field['bundles'] as $entity_type => $bundles) {
|
|
|
foreach ($bundles as $bundle) {
|
|
|
$instance = field_info_instance($entity_type, $field['field_name'], $bundle);
|
|
|
- $channels = array_merge($channels, _cer_find_channels($instance));
|
|
|
+ if ($instance) {
|
|
|
+ $channels = array_merge($channels, _cer_find_channels($instance));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -33,7 +41,7 @@ function cer_settings_form($form = array(), &$form_state) {
|
|
|
$form['values']["enabled_{$count}"] = array(
|
|
|
'#type' => 'checkbox',
|
|
|
'#default_value' => cer_preset_enabled($formatted_key),
|
|
|
- '#title' => theme('cer_label', array('key' => $key)),
|
|
|
+ '#title' => filter_xss(theme('cer_label', array('key' => $key))),
|
|
|
);
|
|
|
}
|
|
|
|
|
@@ -130,9 +138,14 @@ function cer_update_form_submit($form, &$form_state) {
|
|
|
'error_message' => t('Corresponding entity references - existing entity update has encountered an error.'),
|
|
|
);
|
|
|
|
|
|
- $entities = entity_load($form_state['values']['type'], FALSE);
|
|
|
- foreach ($entities as $entity) {
|
|
|
- $batch['operations'][] = array('cer_processing_entity', array('update', $entity, $form_state['values']['type']));
|
|
|
+ $entity_type = $form_state['values']['type'];
|
|
|
+ $query = new EntityFieldQuery();
|
|
|
+ $query->entityCondition('entity_type', $entity_type);
|
|
|
+ $result = $query->execute();
|
|
|
+ if (isset($result[$entity_type])) {
|
|
|
+ foreach ($result[$entity_type] as $entity_id => $stub) {
|
|
|
+ $batch['operations'][] = array('cer_processing_entity', array('update', $entity_id, $entity_type));
|
|
|
+ }
|
|
|
}
|
|
|
batch_set($batch);
|
|
|
}
|
|
@@ -224,17 +237,28 @@ function _cer_get_target_bundles($field) {
|
|
|
// method of finding a field's target bundles.
|
|
|
//
|
|
|
if ($field['settings']['handler'] == 'views') {
|
|
|
- $view = views_get_view($field['settings']['handler_settings']['view']['view_name']);
|
|
|
- $view->set_display($field['settings']['handler_settings']['view']['display_name']);
|
|
|
+ $view_name = $field['settings']['handler_settings']['view']['view_name'];
|
|
|
|
|
|
- $info = entity_get_info($field['settings']['target_type']);
|
|
|
- if ($info['entity keys']['bundle'] && $handler = $view->display_handler->get_handler('filter', $info['entity keys']['bundle'])) {
|
|
|
- $target_bundles = $handler->value;
|
|
|
+ $view = views_get_view($view_name);
|
|
|
+ if ($view) {
|
|
|
+ $view->set_display($field['settings']['handler_settings']['view']['display_name']);
|
|
|
+
|
|
|
+ $info = entity_get_info($field['settings']['target_type']);
|
|
|
+ if ($info['entity keys']['bundle'] && $handler = $view->display_handler->get_handler('filter', $info['entity keys']['bundle'])) {
|
|
|
+ $target_bundles = $handler->value;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ drupal_set_message(t('Could not get target bundles for %field (failed to load view %view).', array('%view' => $view_name, '%field' => $field['field_name'])), 'error');
|
|
|
}
|
|
|
}
|
|
|
- else {
|
|
|
+ elseif (isset($field['settings']['handler_settings']['target_bundles'])) {
|
|
|
$target_bundles = $field['settings']['handler_settings']['target_bundles'];
|
|
|
}
|
|
|
+ else {
|
|
|
+ $info = entity_get_info($field['settings']['target_type']);
|
|
|
+ $target_bundles = array_keys($info['bundles']);
|
|
|
+ }
|
|
|
|
|
|
return $target_bundles;
|
|
|
}
|