diff --git a/entityreference.info b/entityreference.info index 61dc349..a2678fc 100644 --- a/entityreference.info +++ b/entityreference.info @@ -21,6 +21,7 @@ files[] = plugins/behavior/abstract.inc files[] = views/entityreference_plugin_display.inc files[] = views/entityreference_plugin_style.inc files[] = views/entityreference_plugin_row_fields.inc +files[] = views/entityreference_handler_relationship.inc ; Tests. files[] = tests/entityreference.handlers.test diff --git a/views/entityreference.views.inc b/views/entityreference.views.inc index baa7034..c1394a5 100644 --- a/views/entityreference.views.inc +++ b/views/entityreference.views.inc @@ -21,9 +21,11 @@ function entityreference_field_views_data($field) { $field_name = $field['field_name'] . '_target_id'; $parameters = array('@entity' => $entity, '!field_name' => $field['field_name']); $data[$table_name][$field_name]['relationship'] = array( - 'handler' => 'views_handler_relationship', + 'handler' => 'entityreference_handler_relationship', 'base' => $entity_info['base table'], 'base field' => $entity_info['entity keys']['id'], + 'field' => $field_name, + 'field_name' => $field['field_name'], 'label' => t('@entity entity referenced from !field_name', $parameters), 'group' => t('Entity Reference'), 'title' => t('Referenced Entity'), diff --git a/views/entityreference_handler_relationship.inc b/views/entityreference_handler_relationship.inc index e69de29..09b48bb 100644 --- a/views/entityreference_handler_relationship.inc +++ b/views/entityreference_handler_relationship.inc @@ -0,0 +1,65 @@ + -1); + + return $options; + } + + /** + * Add a delta selector for multiple fields. + */ + function options_form(&$form, &$form_state) { + parent::options_form($form, $form_state); + + $field = field_info_field($this->definition['field_name']); + + // Only add the delta selector if the field is multiple. + if ($field['cardinality']) { + $max_delta = ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED) ? 10 : $field['cardinality']; + + $options = array('-1' => t('All')); + for ($i = 0; $i < $max_delta; $i++) { + $options[$i] = $i + 1; + } + $form['delta'] = array( + '#type' => 'select', + '#options' => $options, + '#default_value' => $this->options['delta'], + '#title' => t('Delta'), + '#description' => t('The delta allows you to select which item in a multiple value field to key the relationship off of. Select "1" to use the first item, "2" for the second item, and so on. If you select "All", each item in the field will create a new row, which may appear to cause duplicates.'), + ); + } + } + + function get_join() { + $join = parent::get_join(); + + $field = field_info_field($this->definition['field_name']); + + if ($this->options['delta'] != -1 && $field['cardinality']) { + $join->extra[] = array( + 'field' => 'delta', + 'value' => $this->options['delta'], + 'numeric' => TRUE, + ); + } + return $join; + } + + function ensure_my_table() { + if (!isset($this->table_alias)) { + $join = $this->get_join(); + $this->table_alias = $this->query->add_table($this->table, $this->relationship, $join); + } + return $this->table_alias; + } +}