? 1000760-check_plain-title-multiple-string.patch
? 1001302-DRUPAL-7--3.patch
? 1011004-validate-query.patch
? 1011334-exposed_form-sql.patch
? 20101008-drupal-views-6.x-2.x-dev-admin_inc-undocumented_break-779668-D6__3.patch
? 318944-table_error.patch
? 468484-views-use_relationship.patch
? 497936-profile-fieldnames-have-dashes-reversed.txt
? 522318-views-display_description-human_name_1.patch
? 591302.5.patch
? 608926-theme-views-nodate.patch
? 627378-docu.patch
? 669636_0.patch
? 738792-disable-delete.patch
? 751308-translatable-d6_0_0.patch
? 759082-foreach.patch
? 783514-views_break_string.patch
? 783798-fix-group_by-sort.patch
? 808016-views-field_date-description.patch
? 816354-comment_0.patch
? 833220-form_error-fix.patch
? 833790-fix-click-sort-on-formula-fields_0_0.patch
? 862072-arguments-node_access-7.x.patch
? 868990-set-use-pager-now-gone-in-views-3_0.patch
? 895046-updated-views-multiple-fields.patch
? 895046-views-multiple-fields.patch
? 898990-term-vid_limit-error.patch
? 909332-grid-css-columns_1.patch
? 909886-any-option-showing-up-incorrectly.patch
? 910256-pager-exposed-all.patch
? 940316-fix-theme-information.patch
? 946368-argument_default_user-fix-3.x_0.patch
? 948360-css.patch
? 978864_add_area_item.patch
? 979046-views_access-2.patch
? 983460-table-default_sort-7.patch
? 983460-table-default_sort.patch
? 991202-nl2br_option-3.patch
? _983606.views_.tabs_on_export_results-D6.patch
? ajax-patch-current-state.patch
? patches
? preserve_tags_0.patch
? views-1001542.patch
? views-3.x-buttons_fix-6.x_0.patch
? views-600742.patch
? views-817360.patch
? views-date-field-time-hence.patch
? views-date_now_form_validation-dev.patch
? views-extra_space_wrapper_class_0.patch
? views-field_handler_rel-607942-11.patch
? views-links-2.patch
? views-relationship-fix_0.patch
? views-translation-language-sort.patch
? views_display_20100727.patch
? modules/node/views-make-link-3.0-V2.patch
Index: modules/field/views_handler_field_field.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/modules/field/Attic/views_handler_field_field.inc,v
retrieving revision 1.1.2.27
diff -u -p -r1.1.2.27 views_handler_field_field.inc
--- modules/field/views_handler_field_field.inc 8 Jan 2011 12:42:26 -0000 1.1.2.27
+++ modules/field/views_handler_field_field.inc 20 Jan 2011 14:44:47 -0000
@@ -33,6 +33,29 @@ function _field_view_formatter_options($
*/
class views_handler_field_field extends views_handler_field {
/**
+ * An array to store field renderable arrays for use by render_items.
+ */
+ public $items = array();
+
+ function init(&$view, $options) {
+ parent::init($view, $options);
+
+ $field = $this->definition['field_info'];
+ $this->multiple = FALSE;
+ $this->limit_values = FALSE;
+
+ if ($field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED) {
+ $this->multiple = TRUE;
+
+ // We should only limit values if the user hasn't selected "all", or the
+ // value matching field cardinality (which also means "give me everything")
+ if (is_numeric($this->options['delta_limit']) && ($this->options['delta_limit'] != $field['cardinality'])) {
+ $this->limit_values = TRUE;
+ }
+ }
+ }
+
+ /**
* Called to add the field to a query.
*
* By default, the only columns added to the query are entity_id and
@@ -82,7 +105,6 @@ class views_handler_field_field extends
$this->aliases['entity_type'] = $this->query->add_field(NULL, "'$entity_type'", $entity_type_alias);
$fields = $this->additional_fields;
-
// We've already added entity_type, so we can remove it from the list.
$entity_type_key = array_search('entity_type', $fields);
if ($entity_type_key !== FALSE) {
@@ -100,7 +122,7 @@ class views_handler_field_field extends
}
// Add additional fields (and the table join itself) if needed.
- if ($use_groupby || !empty($this->definition['add fields to query'])) {
+ if ($this->add_field_table($use_groupby)) {
$this->ensure_my_table();
$this->add_additional_fields($fields);
@@ -111,10 +133,20 @@ class views_handler_field_field extends
$this->query->add_where(0, $column, $this->query->options['field_language']);
}
- // Do we need to filter by delta?
- if (is_numeric($this->options['delta'])) {
+ // Limit a multiple value field.
+ // Only done when we are explicitly told to add everything to the query.
+ if ($this->limit_values && !empty($this->definition['add fields to query'])) {
$column = $this->table_alias . ".delta";
- $this->query->add_where(0, $column, (int) $this->options['delta']);
+ $offset = (int) $this->options['delta_offset'];
+ $or = db_or();
+
+ // @todo -- use IN rather than OR and a bunch of = conditions.
+ for ($i = 0; $i < $this->options['delta_limit']; $i++) {
+ $delta = $offset + $i;
+ $or->condition($column, $delta);
+ }
+
+ $this->query->add_where(0, $or);
}
}
@@ -129,6 +161,38 @@ class views_handler_field_field extends
}
/**
+ * Determine if the field table should be added to the query.
+ */
+ function add_field_table($use_groupby) {
+ // Grouping is enabled, or we are explicitly required to do this.
+ if ($use_groupby || !empty($this->definition['add fields to query'])) {
+ return TRUE;
+ }
+ // This a multiple value field, but "group multiple values" is not checked.
+ if ($this->multiple && !$this->options['group_rows']) {
+ return TRUE;
+ }
+ return FALSE;
+ }
+
+ /**
+ * Determine if this field is click sortable.
+ */
+ function click_sortable() {
+ // Not click sortable in any case.
+ if (empty($this->definition['click sortable'])) {
+ return FALSE;
+ }
+ // A field is not click sortable if it's a multiple field with
+ // "group multiple values" checked, since a click sort in that case would
+ // add a join to the field table, which would produce unwanted duplicates.
+ if ($this->multiple && $this->options['group_rows']) {
+ return FALSE;
+ }
+ return TRUE;
+ }
+
+ /**
* Called to determine what to tell the clicksorter.
*/
function click_sort($order) {
@@ -148,9 +212,6 @@ class views_handler_field_field extends
$field_type = field_info_field_types($field['type']);
$column_names = array_keys($field['columns']);
- $options['delta'] = array(
- 'default' => '',
- );
// If the field has a "value" column, we probably need that one.
$options['click_sort_column'] = array(
'default' => in_array('value', $column_names) ? 'value' : '',
@@ -168,6 +229,33 @@ class views_handler_field_field extends
'default' => array(),
);
+ // Options used for multiple value fields.
+ $options['group_rows'] = array(
+ 'default' => TRUE,
+ );
+ // If we know the exact number of allowed values, then that can be
+ // the default. Otherwise, default to 'all'.
+ $options['delta_limit'] = array(
+ 'default' => ($field['cardinality'] > 1) ? $field['cardinality'] : 'all',
+ );
+ $options['delta_offset'] = array(
+ 'default' => 0,
+ );
+ $options['delta_reversed'] = array(
+ 'default' => FALSE,
+ );
+
+ $options['multi_type'] = array(
+ 'default' => 'separator'
+ );
+ $options['separator'] = array(
+ 'default' => ', '
+ );
+
+ $options['entity_api_classes'] = array(
+ 'default' => FALSE,
+ );
+
return $options;
}
@@ -178,24 +266,9 @@ class views_handler_field_field extends
$formatters = _field_view_formatter_options($field['type']);
$column_names = array_keys($field['columns']);
- if ($field['cardinality'] > 1 || $field['cardinality'] == FIELD_CARDINALITY_UNLIMITED) {
- if ($field['cardinality'] == FIELD_CARDINALITY_UNLIMITED) {
- $type = 'textfield';
- $options = NULL;
- $description = t('The sequence number of the value to show. Numbers start from 0. Leave empty to display all values.');
- }
- else {
- $type = 'select';
- $options = array_merge(array('' => t('All')), range(0, $field['cardinality'] - 1));
- $description = t('The sequence number of the value to show.');
- }
- $form['delta'] = array(
- '#title' => t('Delta'),
- '#type' => $type,
- '#options' => $options,
- '#default_value' => $this->options['delta'],
- '#description' => $description,
- );
+ // If this is a multiple value field, add its options.
+ if ($this->multiple) {
+ $this->multiple_options_form($form, $form_state);
}
// No need to ask the user anything if the field has only one column.
@@ -225,6 +298,17 @@ class views_handler_field_field extends
),
);
+ $form['entity_api_classes'] = array(
+ '#title' => t('Use Entity API classes'),
+ '#type' => 'checkbox',
+ '#default_value' => $this->options['entity_api_classes'],
+ '#description' => t('If checked, entity api classes will be added using field.tpl.php. This is not recommended unless your CSS depends upon these classes.'),
+ );
+
+ if ($this->multiple) {
+ $form['entity_api_classes']['#description'] .= ' ' . t('Checking this option will cause the group Display Type and Separator values to be ignored.');
+ }
+
// Get the currently selected formatter.
if (isset($form_state['values']['options']['type'])) {
$format = $form_state['values']['options']['type'];
@@ -255,6 +339,97 @@ class views_handler_field_field extends
}
/**
+ * Provide options for multiple value fields.
+ */
+ function multiple_options_form(&$form, &$form_state) {
+ $field = $this->definition['field_info'];
+
+ $form['multiple_prefix'] = array(
+ '#markup' => '',
+ );
+
+ }
+
+ /**
* Extend the groupby form with group columns.
*/
function groupby_form(&$form, &$form_state) {
@@ -324,41 +499,130 @@ class views_handler_field_field extends
}
}
- function render($values) {
- if (isset($values->_field_data[$this->field_alias])) {
- // Prepare arguments for rendering based on the objects cached in the
- // pre-render phase and the display options for this field.
- $entity_type = $values->_field_data[$this->field_alias]['entity_type'];
- $entity = $values->_field_data[$this->field_alias]['entity'];
- $display_entity = clone $entity;
- $langcode = $this->field_language();
-
- // The field we are trying to display is empty, or doesn't exist on
- // this entity.
- if (empty($display_entity->{$this->definition['field_name']})) {
- return '';
- }
-
- // The user wants to render only one value from a multivalue field.
- // The Field API doesn't support this, so we just hack out the
- // values we don't want to render.
- if (is_numeric($this->options['delta'])) {
- $delta = (int) $this->options['delta'];
-
- $display_entity->{$this->definition['field_name']}[$langcode] = array($display_entity->{$this->definition['field_name']}[$langcode][$delta]);
- }
-
- $display = array(
- 'type' => $this->options['type'],
- 'settings' => $this->options['settings'],
- 'label' => 'hidden',
- );
+ /**
+ * Render all items in this field together.
+ *
+ * When using advanced render, each possible item in the list is rendered
+ * individually. Then the items are all pasted together.
+ */
+ function render_items($items) {
+ if (!empty($items)) {
+ if (!$this->options['group_rows']) {
+ return implode('', $items);
+ }
- $render_array = field_view_field($entity_type, $display_entity, $this->definition['field_name'], $display, $langcode);
- return drupal_render($render_array);
+ if ($this->options['multi_type'] == 'separator') {
+ return implode(check_plain($this->options['separator']), $items);
+ }
+ else {
+ return theme('item_list',
+ array(
+ 'items' => $items,
+ 'title' => NULL,
+ 'type' => $this->options['multi_type']
+ ));
+ }
}
- else {
- return '';
+ }
+
+ /**
+ * Return an array of items for the field.
+ *
+ * Items should be stored in the result array, if possible, as an array
+ * with 'value' as the actual displayable value of the item, plus
+ * any items that might be found in the 'alter' options array for
+ * creating links, such as 'path', 'fragment', 'query' etc, such a thing
+ * is to be made. Additionally, items that might be turned into tokens
+ * should also be in this array.
+ */
+ function get_items($values) {
+ if (empty($values->_field_data[$this->field_alias])) {
+ return array();
+ }
+
+ $langcode = $this->field_language();
+
+ // Go ahead and render and store in $this->items.
+ $entity = clone $values->_field_data[$this->field_alias]['entity'];
+ $entity_type = $values->_field_data[$this->field_alias]['entity_type'];
+
+ // The field we are trying to display is empty, or doesn't exist on
+ // this entity.
+ if (empty($entity->{$this->definition['field_name']})) {
+ return array();
+ }
+
+ if ($this->limit_values) {
+ // Don't let odd usage cause errors.
+ // @todo -- how do we tell it to render all values in an unlimited?
+ if ($this->options['delta_limit'] == 0) {
+ array();
+ }
+
+ $all_values = $entity->{$this->definition['field_name']}[$langcode];
+ if ($this->options['delta_reversed']) {
+ $all_values = array_reverse($all_values);
+ }
+
+ // Offset is calculated differently when row grouping for a field is
+ // not enabled. Since there are multiple rows, the delta needs to be
+ // taken into account, so that different values are shown per row.
+ $offset = intval($this->options['delta_offset']);
+ if (!$this->options['group_rows']) {
+ $delta = $values->{$this->aliases['delta']};
+ $offset += $this->options['delta_limit'] * $delta;
+ }
+
+ $new_values = array();
+ for ($i = 0; $i < $this->options['delta_limit']; $i++) {
+ $new_delta = $offset + $i;
+
+ if (isset($all_values[$new_delta])) {
+ $new_values[] = $all_values[$new_delta];
+ }
+ }
+ $entity->{$this->definition['field_name']}[$langcode] = $new_values;
+ }
+
+ $display = array(
+ 'type' => $this->options['type'],
+ 'settings' => $this->options['settings'],
+ 'label' => 'hidden',
+ );
+
+ $render_array = field_view_field($entity_type, $entity, $this->definition['field_name'], $display, $langcode);
+
+ $items = array();
+ if ($this->options['entity_api_classes']) {
+ // Make a copy.
+ $array = $render_array;
+ return array(array('rendered' => drupal_render($render_array)));
+ }
+
+ foreach (element_children($render_array) as $count) {
+ $items[$count]['rendered'] = $render_array[$count];
+ $items[$count]['raw'] = $render_array['#items'][$count];
+ }
+ return $items;
+ }
+
+ function render_item($count, $item) {
+ return render($item['rendered']);
+ }
+
+ function document_self_tokens(&$tokens) {
+ $field = $this->definition['field_info'];
+ foreach ($field['columns'] as $id => $column) {
+ $tokens['[' . $this->options['id'] . '-' . $id . ']'] = t('Raw @column', array('@column' => $id));
+ }
+ }
+
+ function add_self_tokens(&$tokens, $item) {
+ $field = $this->definition['field_info'];
+ foreach ($field['columns'] as $id => $column) {
+ // Use filter_xss_admin because it's user data and we can't be sure it is safe.
+ // We know nothing about the data, though, so we can't really do much else.
+ $tokens['[' . $this->options['id'] . '-' . $id . ']'] = filter_xss_admin($item['raw'][$id]);
}
}
@@ -381,4 +645,21 @@ class views_handler_field_field extends
return LANGUAGE_NONE;
}
}
+
+ /**
+ * Return DIV or SPAN based upon the field's element type.
+ *
+ * Fields rendered with the 'group multiple' option use
markers,
+ * and thus shouldn't be wrapped in a .
+ */
+// function element_type() {
+// if (!$this->multiple || !$this->options['group_rows']) {
+// return parent::element_type();
+// }
+//
+// if (isset($this->definition['element type'])) {
+// return $this->definition['element type'];
+// }
+// return 'div';
+// }
}