diff --git a/lib/Drupal/views/Plugin/views/field/Entity.php b/lib/Drupal/views/Plugin/views/field/Entity.php deleted file mode 100644 index 4c36aeb..0000000 --- a/lib/Drupal/views/Plugin/views/field/Entity.php +++ /dev/null @@ -1,113 +0,0 @@ -table); - $this->entity_type = $table_data['table']['entity type']; - } - - /** - * Overriden to add the field for the entity id. - */ - function query() { - $this->table_alias = $base_table = $this->view->base_table; - $this->base_field = $this->view->base_field; - - if (!empty($this->relationship)) { - foreach ($this->view->relationship as $relationship) { - if ($relationship->alias == $this->relationship) { - $base_table = $relationship->definition['base']; - $this->table_alias = $relationship->alias; - - $table_data = views_fetch_data($base_table); - $this->base_field = empty($relationship->definition['base field']) ? $table_data['table']['base']['field'] : $relationship->definition['base field']; - } - } - } - - // Add the field if the query back-end implements an add_field() method, - // just like the default back-end. - if (method_exists($this->query, 'add_field')) { - $this->field_alias = $this->query->add_field($this->table_alias, $this->base_field, ''); - } - - $this->add_additional_fields(); - } - - /** - * Load the entities for all rows that are about to be displayed. - */ - function pre_render(&$values) { - if (!empty($values)) { - list($this->entity_type, $this->entities) = $this->query->get_result_entities($values, !empty($this->relationship) ? $this->relationship : NULL, $this->field_alias); - } - } - - /** - * Overridden to return the entity object, or a certain property of the entity. - */ - function get_value($values, $field = NULL) { - if (isset($this->entities[$this->view->row_index])) { - $entity = $this->entities[$this->view->row_index]; - // Support to get a certain part of the entity. - if (isset($field) && isset($entity->{$field})) { - return $entity->{$field}; - } - // Support to get a part of the values as the normal get_value. - elseif (isset($field) && isset($values->{$this->aliases[$field]})) { - return $values->{$this->aliases[$field]}; - } - else { - return $entity; - } - } - return FALSE; - } - -} diff --git a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php index 8c37184..6c318dc 100644 --- a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php +++ b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php @@ -363,6 +363,22 @@ abstract class FieldPluginBase extends HandlerBase { } /** + * Get the entity matching the current row and relationship. + * + * @param $values + * An object containing all retrieved values. + */ + function get_entity($values) { + $relationship_id = $this->options['relationship']; + if ($relationship_id == 'none') { + return $values->_entity; + } + else { + return $values->_relationship_entities[$relationship_id]; + } + } + + /** * Get the value that's supposed to be rendered. * * This api exists so that other modules can easy set the values of the field diff --git a/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php b/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php index 51884cc..72dbf69 100644 --- a/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php +++ b/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php @@ -158,10 +158,14 @@ abstract class QueryPluginBase extends PluginBase implements QueryInterface { } /** - * Returns the according entity objects for the given query results. + * Loads all entities contained in the passed-in $results. + *. + * If the entity belongs to the base table, then it gets stored in + * $result->_entity. Otherwise, it gets stored in + * $result->_relationship_entities[$relationship_id]; + * + * Query plugins that don't support entities can leave the method empty. */ - function get_result_entities($results, $relationship = NULL) { - return FALSE; - } + function load_entities(&$results) {} } diff --git a/lib/Drupal/views/Plugin/views/query/Sql.php b/lib/Drupal/views/Plugin/views/query/Sql.php index e2465ad..870b075 100644 --- a/lib/Drupal/views/Plugin/views/query/Sql.php +++ b/lib/Drupal/views/Plugin/views/query/Sql.php @@ -110,15 +110,6 @@ class Sql extends QueryPluginBase { var $no_distinct; /** - * Defines the distinct type. - * - FALSE if it's distinct by base field. - * - TRUE if it just adds the sql distinct keyword. - * - * @var bool - */ - public $pure_distinct = FALSE; - - /** * Constructor; Create the basic query object and fill with default values. */ function init($base_table = 'node', $base_field = 'nid', $options) { @@ -146,17 +137,6 @@ class Sql extends QueryPluginBase { 'alias' => $base_table, ); - /** - * -- we no longer want the base field to appear automatigically. - if ($base_field) { - $this->fields[$base_field] = array( - 'table' => $base_table, - 'field' => $base_field, - 'alias' => $base_field, - ); - } - */ - $this->count_field = array( 'table' => $base_table, 'field' => $base_field, @@ -169,20 +149,14 @@ class Sql extends QueryPluginBase { // Utility methods to set flags and data. /** - * Set the view to be distinct. - * - * There are either distinct per base field or distinct in the pure sql way, - * based on $pure_distinct. + * Set the view to be distinct (per base field). * * @param bool $value * Should the view by distincted. - * @param bool $pure_distinct - * Should only the sql keyword be added. */ - function set_distinct($value = TRUE, $pure_distinct = FALSE) { + function set_distinct($value = TRUE) { if (!(isset($this->no_distinct) && $value)) { $this->distinct = $value; - $this->pure_distinct = $pure_distinct; } } @@ -220,10 +194,6 @@ class Sql extends QueryPluginBase { 'default' => FALSE, 'bool' => TRUE, ); - $options['pure_distinct'] = array( - 'default' => FALSE, - 'bool' => TRUE, - ); $options['slave'] = array( 'default' => FALSE, 'bool' => TRUE, @@ -257,17 +227,6 @@ class Sql extends QueryPluginBase { '#description' => t('This will make the view display only distinct items. If there are multiple identical items, each will be displayed only once. You can use this to try and remove duplicates from a view, though it does not always work. Note that this can slow queries down, so use it with caution.'), '#default_value' => !empty($this->options['distinct']), ); - $form['pure_distinct'] = array( - '#type' => 'checkbox', - '#title' => t('Pure Distinct'), - '#description' => t('This will prevent views from adding the base column to the distinct field. If this is not selected and the base column is a primary key, then a non-pure distinct will not function properly because the primary key is always unique.'), - '#default_value' => !empty($this->options['pure_distinct']), - '#states' => array( - 'visible' => array( - ':input[name="query[options][distinct]"]' => array('checked' => TRUE), - ), - ), - ); $form['slave'] = array( '#type' => 'checkbox', '#title' => t('Use Slave Server'), @@ -1251,12 +1210,32 @@ class Sql extends QueryPluginBase { * Provide a countquery if this is true, otherwise provide a normal query. */ function query($get_count = FALSE) { + // Make sure each entity table has the base field added so that the + // entities can be loaded. + $entity_tables = $this->get_entity_tables(); + if ($entity_tables) { + $params = array(); + // @todo Using $this->view->display_handler here is a huge hack that + // needs to be resolved. Right now, the query doesn't actually know + // if aggregation is on, so that info needs to be injected. + if ($this->view->display_handler->use_group_by()) { + // Handle grouping, by retrieving the minimum entity_id. + $params = array( + 'function' => 'min', + ); + } + + foreach ($entity_tables as $table_alias => $table) { + $info = entity_get_info($table['entity_type']); + $base_field = empty($table['revision']) ? $info['entity keys']['id'] : $info['entity keys']['revision']; + $this->add_field($table_alias, $base_field, '', $params); + } + } + // Check query distinct value. if (empty($this->no_distinct) && $this->distinct && !empty($this->fields)) { - if ($this->pure_distinct === FALSE) { - $base_field_alias = $this->add_field($this->base_table, $this->base_field); - $this->add_groupby($base_field_alias); - } + $base_field_alias = $this->add_field($this->base_table, $this->base_field); + $this->add_groupby($base_field_alias); $distinct = TRUE; } @@ -1403,7 +1382,7 @@ class Sql extends QueryPluginBase { function build(&$view) { // Make the query distinct if the option was set. if (!empty($this->options['distinct'])) { - $this->set_distinct(TRUE, !empty($this->options['pure_distinct'])); + $this->set_distinct(TRUE); } // Store the view in the object to be able to use it later. @@ -1491,10 +1470,12 @@ class Sql extends QueryPluginBase { } $view->pager->post_execute($view->result); - if ($view->pager->use_count_query() || !empty($view->get_total_rows)) { $view->total_rows = $view->pager->get_total_items(); } + + // Load all entities contained in the results. + $this->load_entities($view->result); } catch (DatabaseExceptionWrapper $e) { $view->result = array(); @@ -1513,6 +1494,125 @@ class Sql extends QueryPluginBase { $view->execute_time = microtime(TRUE) - $start; } + /** + * Returns an array of all tables from the query that map to an entity type. + * + * Includes the base table and all relationships, if eligible. + * Available keys for each table: + * - base: The actual base table (i.e. "user" for an author relationship). + * - relationship_id: The id of the relationship, or "none". + * - entity_type: The entity type matching the base table. + * - revision: A boolean that specifies whether the table is a base table or + * a revision table of the entity type. + * + * @return array + * An array of table information, keyed by table alias. + */ + function get_entity_tables() { + // Start with the base table. + $entity_tables = array(); + $base_table_data = views_fetch_data($this->base_table); + if (isset($base_table_data['table']['entity type'])) { + $entity_tables[$this->base_table] = array( + 'base' => $this->base_table, + 'relationship_id' => 'none', + 'entity_type' => $base_table_data['table']['entity type'], + 'revision' => FALSE, + ); + } + // Include all relationships. + foreach ($this->view->relationship as $relationship_id => $relationship) { + $table_data = views_fetch_data($relationship->definition['base']); + if (isset($table_data['table']['entity type'])) { + $entity_tables[$relationship->alias] = array( + 'base' => $relationship->definition['base'], + 'relationship_id' => $relationship_id, + 'entity_type' => $table_data['table']['entity type'], + 'revision' => FALSE, + ); + } + } + + // Determine which of the tables are revision tables. + foreach ($entity_tables as $table_alias => $table) { + $info = entity_get_info($table['entity_type']); + if (isset($info['revision table']) && $info['revision table'] == $table['base']) { + $entity_tables[$table_alias]['revision'] = TRUE; + } + } + + return $entity_tables; + } + + /** + * Loads all entities contained in the passed-in $results. + *. + * If the entity belongs to the base table, then it gets stored in + * $result->_entity. Otherwise, it gets stored in + * $result->_relationship_entities[$relationship_id]; + */ + function load_entities(&$results) { + $entity_tables = $this->get_entity_tables(); + // No entity tables found, nothing else to do here. + if (empty($entity_tables)) { + return; + } + + // Initialize the entity placeholders in $results. + foreach ($results as $index => $result) { + $results[$index]->_entity = FALSE; + $results[$index]->_relationship_entities = array(); + } + + // Assemble a list of entities to load. + $ids_by_table = array(); + foreach ($entity_tables as $table_alias => $table) { + $entity_type = $table['entity_type']; + $info = entity_get_info($entity_type); + $id_key = empty($table['revision']) ? $info['entity keys']['id'] : $info['entity keys']['revision']; + $id_alias = $this->get_field_alias($table_alias, $id_key); + + foreach ($results as $index => $result) { + // Store the entity id if it was found. + if (!empty($result->$id_alias)) { + $ids_by_table[$table_alias][$index] = $result->$id_alias; + } + } + } + + // Load all entities and assign them to the correct result row. + foreach ($ids_by_table as $table_alias => $ids) { + $table = $entity_tables[$table_alias]; + $entity_type = $table['entity_type']; + $relationship_id = $table['relationship_id']; + + // Drupal core currently has no way to load multiple revisions. Sad. + if ($table['revision']) { + $entities = array(); + foreach ($ids as $index => $revision_id) { + $entity = entity_revision_load($entity_type, $revision_id); + if ($entity) { + $entities[$revision_id] = $entity; + } + } + } + else { + $entities = entity_load_multiple($entity_type, $ids); + } + + foreach ($ids as $index => $id) { + $entity = isset($entities[$id]) ? $entities[$id] : FALSE; + + if ($relationship_id == 'none') { + $results[$index]->_entity = $entity; + } + else { + $results[$index]->_relationship_entities[$relationship_id] = $entity; + } + } + } + } + function add_signature(&$view) { $view->query->add_field(NULL, "'" . $view->name . ':' . $view->current_display . "'", 'view_name'); } @@ -1598,50 +1698,6 @@ class Sql extends QueryPluginBase { ); } - /** - * Returns the according entity objects for the given query results. - * - */ - function get_result_entities($results, $relationship = NULL) { - $base_table = $this->base_table; - $base_table_alias = $base_table; - - if (!empty($relationship)) { - foreach ($this->view->relationship as $current) { - if ($current->alias == $relationship) { - $base_table = $current->definition['base']; - $base_table_alias = $relationship; - break; - } - } - } - $table_data = views_fetch_data($base_table); - - // Bail out if the table has not specified the according entity-type. - if (!isset($table_data['table']['entity type'])) { - return FALSE; - } - $entity_type = $table_data['table']['entity type']; - $info = entity_get_info($entity_type); - $id_alias = $this->get_field_alias($base_table_alias, $info['entity keys']['id']); - - // Assemble the ids of the entities to load. - $ids = array(); - foreach ($results as $key => $result) { - if (isset($result->$id_alias)) { - $ids[$key] = $result->$id_alias; - } - } - - $entities = entity_load_multiple($entity_type, $ids); - // Re-key the array by row-index. - $result = array(); - foreach ($ids as $key => $id) { - $result[$key] = isset($entities[$id]) ? $entities[$id] : FALSE; - } - return array($entity_type, $result); - } - function aggregation_method_simple($group_type, $field) { return strtoupper($group_type) . '(' . $field . ')'; } diff --git a/lib/Views/comment/Plugin/views/field/Link.php b/lib/Views/comment/Plugin/views/field/Link.php index 5467f40..442b9d5 100644 --- a/lib/Views/comment/Plugin/views/field/Link.php +++ b/lib/Views/comment/Plugin/views/field/Link.php @@ -7,7 +7,7 @@ namespace Views\comment\Plugin\views\field; -use Drupal\views\Plugin\views\field\Entity; +use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; /** @@ -20,11 +20,7 @@ use Drupal\Core\Annotation\Plugin; * module = "comment" * ) */ -class Link extends Entity { - - function construct() { - parent::construct(); - } +class Link extends FieldPluginBase { function option_definition() { $options = parent::option_definition(); @@ -47,19 +43,16 @@ class Link extends Entity { parent::options_form($form, $form_state); } - function query() { - $this->ensure_my_table(); - $this->add_additional_fields(); - } + function query() {} function render($values) { - $value = $this->get_value($values, 'cid'); - return $this->render_link($this->sanitize_value($value), $values); + $comment = $this->get_entity($values); + return $this->render_link($comment, $values); } function render_link($data, $values) { $text = !empty($this->options['text']) ? $this->options['text'] : t('view'); - $comment = $this->get_value($values); + $comment = $data; $nid = $comment->nid; $cid = $comment->id(); diff --git a/lib/Views/comment/Plugin/views/field/NodeLink.php b/lib/Views/comment/Plugin/views/field/NodeLink.php index 799e46a..fad4fd2 100644 --- a/lib/Views/comment/Plugin/views/field/NodeLink.php +++ b/lib/Views/comment/Plugin/views/field/NodeLink.php @@ -7,7 +7,7 @@ namespace Views\comment\Plugin\views\field; -use Drupal\views\Plugin\views\field\Entity; +use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; /** @@ -20,22 +20,7 @@ use Drupal\Core\Annotation\Plugin; * module = "comment" * ) */ -class NodeLink extends Entity { - - function construct() { - parent::construct(); - - // Add the node fields that comment_link will need.. - $this->additional_fields['nid'] = array( - 'field' => 'nid', - ); - $this->additional_fields['type'] = array( - 'field' => 'type', - ); - $this->additional_fields['comment'] = array( - 'field' => 'comment', - ); - } +class NodeLink extends FieldPluginBase { function option_definition() { $options = parent::option_definition(); @@ -54,14 +39,10 @@ class NodeLink extends Entity { parent::options_form($form, $form_state); } - function query() { - $this->ensure_my_table(); - $this->add_additional_fields(); - } + function query() {} function render($values) { - // Build fake $node. - $node = $this->get_value($values); + $node = $this->get_entity($values); // Call comment.module's hook_link: comment_link($type, $node = NULL, $teaser = FALSE) // Call node by reference so that something is changed here diff --git a/lib/Views/field/Plugin/views/field/Field.php b/lib/Views/field/Plugin/views/field/Field.php index b0f2fc4..4b3a2cf 100644 --- a/lib/Views/field/Plugin/views/field/Field.php +++ b/lib/Views/field/Plugin/views/field/Field.php @@ -135,58 +135,15 @@ class Field extends FieldPluginBase { /** * Called to add the field to a query. * - * By default, the only columns added to the query are entity_id and - * entity_type. This is because other needed data is fetched by entity_load(). - * Other columns are added only if they are used in groupings, or if - * 'add fields to query' is specifically set to TRUE in the field definition. - * - * The 'add fields to query' switch is used by modules which need all data - * present in the query itself (such as "sphinx"). + * By default, all needed data is taken from entities loaded by the query + * plugin. Columns are added only if they are used in groupings. */ function query($use_groupby = FALSE) { $this->get_base_table(); - $params = array(); - if ($use_groupby) { - // When grouping on a "field API" field (whose "real_field" is set to - // entity_id), retrieve the minimum entity_id to have a valid entity_id to - // pass to field_view_field(). - $params = array( - 'function' => 'min', - ); - - $this->ensure_my_table(); - } - - // Get the entity type according to the base table of the field. - // Then add it to the query as a formula. That way we can avoid joining - // the field table if all we need is entity_id and entity_type. $entity_type = $this->definition['entity_tables'][$this->base_table]; - $entity_info = entity_get_info($entity_type); - - if (isset($this->relationship)) { - $this->base_table_alias = $this->relationship; - } - else { - $this->base_table_alias = $this->base_table; - } - - // We always need the base field (entity_id / revision_id). - if (empty($this->definition['is revision'])) { - $this->field_alias = $this->query->add_field($this->base_table_alias, $entity_info['entity keys']['id'], '', $params); - } - else { - $this->field_alias = $this->query->add_field($this->base_table_alias, $entity_info['entity keys']['revision'], '', $params); - $this->aliases['entity_id'] = $this->query->add_field($this->base_table_alias, $entity_info['entity keys']['id'], '', $params); - } - - - // The alias needs to be unique, so we use both the field table and the entity type. - $entity_type_alias = $this->definition['table'] . '_' . $entity_type . '_entity_type'; - $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. + // No need to add the entity type. $entity_type_key = array_search('entity_type', $fields); if ($entity_type_key !== FALSE) { unset($fields[$entity_type_key]); @@ -195,14 +152,11 @@ class Field extends FieldPluginBase { if ($use_groupby) { // Add the fields that we're actually grouping on. $options = array(); - if ($this->options['group_column'] != 'entity_id') { $options = array($this->options['group_column'] => $this->options['group_column']); } - $options += is_array($this->options['group_columns']) ? $this->options['group_columns'] : array(); - $fields = array(); $rkey = $this->definition['is revision'] ? 'FIELD_LOAD_REVISION' : 'FIELD_LOAD_CURRENT'; // Go through the list and determine the actual column name from field api. @@ -245,23 +199,14 @@ class Field extends FieldPluginBase { $this->query->add_where_expression(0, "$column IN($placeholder) OR $column IS NULL", array($placeholder => $langcode_fallback_candidates)); } } - - // The revision id inhibits grouping. - // So, stop here if we're using grouping, or if aren't adding all columns to - // the query. - if ($use_groupby || empty($this->definition['add fields to query'])) { - return; - } - - $this->add_additional_fields(array('revision_id')); } /** * 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'])) { + // Grouping is enabled. + if ($use_groupby) { return TRUE; } // This a multiple value field, but "group multiple values" is not checked. @@ -622,69 +567,6 @@ class Field extends FieldPluginBase { } /** - * Load the entities for all fields that are about to be displayed. - */ - function post_execute(&$values) { - if (!empty($values)) { - // Divide the entity ids by entity type, so they can be loaded in bulk. - $entities_by_type = array(); - $revisions_by_type = array(); - foreach ($values as $key => $object) { - if (isset($this->aliases['entity_type']) && isset($object->{$this->aliases['entity_type']}) && isset($object->{$this->field_alias}) && !isset($values[$key]->_field_data[$this->field_alias])) { - $entity_type = $object->{$this->aliases['entity_type']}; - if (empty($this->definition['is revision'])) { - $entity_id = $object->{$this->field_alias}; - $entities_by_type[$entity_type][$key] = $entity_id; - } - else { - $revision_id = $object->{$this->field_alias}; - $entity_id = $object->{$this->aliases['entity_id']}; - $entities_by_type[$entity_type][$key] = array($entity_id, $revision_id); - } - } - } - - // Load the entities. - foreach ($entities_by_type as $entity_type => $entity_ids) { - $entity_info = entity_get_info($entity_type); - if (empty($this->definition['is revision'])) { - $entities = entity_load_multiple($entity_type, $entity_ids); - $keys = $entity_ids; - } - else { - // Revisions can't be loaded multiple, so we have to load them - // one by one. - $entities = array(); - $keys = array(); - foreach ($entity_ids as $key => $combined) { - list($entity_id, $revision_id) = $combined; - $entity = entity_revision_load($entity_type, $revision_id); - if ($entity) { - $entities[$revision_id] = array_shift($entity); - $keys[$key] = $revision_id; - } - } - } - - foreach ($keys as $key => $entity_id) { - // If this is a revision, load the revision instead. - if (isset($entities[$entity_id])) { - $values[$key]->_field_data[$this->field_alias] = array( - 'entity_type' => $entity_type, - 'entity' => $entities[$entity_id], - ); - } - } - } - - // Now, transfer the data back into the resultset so it can be easily used. - foreach ($values as $row_id => &$value) { - $value->{'field_' . $this->options['id']} = $this->set_items($value, $row_id); - } - } - } - - /** * Render all items in this field together. * * When using advanced render, each possible item in the list is rendered @@ -710,16 +592,76 @@ class Field extends FieldPluginBase { } } + /** + * Return an array of items for the field. + */ function get_items($values) { - return $values->{'field_' . $this->options['id']}; - } + $original_entity = $this->get_entity($values); + if (!$original_entity) { + return array(); + } + $entity = $this->process_entity($original_entity); + if (!$entity) { + return array(); + } - function get_value($values, $field = NULL) { - // Go ahead and render and store in $this->items. - $entity = clone $values->_field_data[$this->field_alias]['entity']; + $display = array( + 'type' => $this->options['type'], + 'settings' => $this->options['settings'], + 'label' => 'hidden', + // Pass the View object in the display so that fields can act on it. + 'views_view' => $this->view, + 'views_field' => $this, + 'views_row_id' => $this->view->row_index, + ); - $entity_type = $values->_field_data[$this->field_alias]['entity_type']; + $entity_type = $entity->entityType(); $langcode = $this->field_langcode($entity_type, $entity); + $render_array = field_view_field($entity_type, $entity, $this->definition['field_name'], $display, $langcode); + + $items = array(); + if ($this->options['field_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]; + // field_view_field() adds an #access property to the render array that + // determines whether or not the current user is allowed to view the + // field in the context of the current entity. We need to respect this + // parameter when we pull out the children of the field array for + // rendering. + if (isset($render_array['#access'])) { + $items[$count]['rendered']['#access'] = $render_array['#access']; + } + // Only add the raw field items (for use in tokens) if the current user + // has access to view the field content. + if ((!isset($items[$count]['rendered']['#access']) || $items[$count]['rendered']['#access']) && !empty($render_array['#items'][$count])) { + $items[$count]['raw'] = $render_array['#items'][$count]; + } + } + return $items; + } + + /** + * Process an entity before using it for rendering. + * + * Replaces values with aggregated values if aggregation is enabled. + * Takes delta settings into account (@todo remove in #1758616). + * + * @param $entity + * The entity to be processed. + * + * @return + * TRUE if the processing completed successfully, otherwise FALSE. + */ + function process_entity($entity) { + $processed_entity = clone $entity; + + $entity_type = $entity->entityType(); + $langcode = $this->field_langcode($entity_type, $processed_entity); // If we are grouping, copy our group fields into the cloned entity. // It's possible this will cause some weirdness, but there's only // so much we can hope to do. @@ -744,21 +686,21 @@ class Field extends FieldPluginBase { if ($data) { // Now, overwrite the original value with our aggregated value. // This overwrites it so there is always just one entry. - $entity->{$this->definition['field_name']}[$langcode] = array($base_value); + $processed_entity->{$this->definition['field_name']}[$langcode] = array($base_value); } else { - $entity->{$this->definition['field_name']}[$langcode] = array(); + $processed_entity->{$this->definition['field_name']}[$langcode] = array(); } } // The field we are trying to display doesn't exist on this entity. - if (!isset($entity->{$this->definition['field_name']})) { - return array(); + if (!isset($processed_entity->{$this->definition['field_name']})) { + return FALSE; } // We are supposed to show only certain deltas. - if ($this->limit_values && !empty($entity->{$this->definition['field_name']})) { - $all_values = !empty($entity->{$this->definition['field_name']}[$langcode]) ? $entity->{$this->definition['field_name']}[$langcode] : array(); + if ($this->limit_values && !empty($processed_entity->{$this->definition['field_name']})) { + $all_values = !empty($processed_entity->{$this->definition['field_name']}[$langcode]) ? $processed_entity->{$this->definition['field_name']}[$langcode] : array(); if ($this->options['delta_reversed']) { $all_values = array_reverse($all_values); } @@ -804,69 +746,10 @@ class Field extends FieldPluginBase { } } } - $entity->{$this->definition['field_name']}[$langcode] = $new_values; - } - - if ($field == 'entity') { - return $entity; - } - else { - return !empty($entity->{$this->definition['field_name']}[$langcode]) ? $entity->{$this->definition['field_name']}[$langcode] : array(); + $processed_entity->{$this->definition['field_name']}[$langcode] = $new_values; } - } - /** - * Return an array of items for the field. - */ - function set_items($values, $row_id) { - if (empty($values->_field_data[$this->field_alias]) || empty($values->_field_data[$this->field_alias]['entity'])) { - return array(); - } - - $display = array( - 'type' => $this->options['type'], - 'settings' => $this->options['settings'], - 'label' => 'hidden', - // Pass the View object in the display so that fields can act on it. - 'views_view' => $this->view, - 'views_field' => $this, - 'views_row_id' => $row_id, - ); - - - $entity_type = $values->_field_data[$this->field_alias]['entity_type']; - $entity = $this->get_value($values, 'entity'); - if (!$entity) { - return array(); - } - - $langcode = $this->field_langcode($entity_type, $entity); - $render_array = field_view_field($entity_type, $entity, $this->definition['field_name'], $display, $langcode); - - $items = array(); - if ($this->options['field_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]; - // field_view_field() adds an #access property to the render array that - // determines whether or not the current user is allowed to view the - // field in the context of the current entity. We need to respect this - // parameter when we pull out the children of the field array for - // rendering. - if (isset($render_array['#access'])) { - $items[$count]['rendered']['#access'] = $render_array['#access']; - } - // Only add the raw field items (for use in tokens) if the current user - // has access to view the field content. - if ((!isset($items[$count]['rendered']['#access']) || $items[$count]['rendered']['#access']) && !empty($render_array['#items'][$count])) { - $items[$count]['raw'] = $render_array['#items'][$count]; - } - } - return $items; + return $processed_entity; } function render_item($count, $item) { diff --git a/lib/Views/node/Plugin/views/field/Link.php b/lib/Views/node/Plugin/views/field/Link.php index 6219233..59560a2 100644 --- a/lib/Views/node/Plugin/views/field/Link.php +++ b/lib/Views/node/Plugin/views/field/Link.php @@ -7,7 +7,7 @@ namespace Views\node\Plugin\views\field; -use Drupal\views\Plugin\views\field\Entity; +use Drupal\views\Plugin\views\field\FieldPluginBase; use Drupal\Core\Annotation\Plugin; /** @@ -20,7 +20,7 @@ use Drupal\Core\Annotation\Plugin; * module = "node" * ) */ -class Link extends Entity { +class Link extends FieldPluginBase { function option_definition() { $options = parent::option_definition(); @@ -41,8 +41,10 @@ class Link extends Entity { $form['alter']['external'] = array('#access' => FALSE); } + function query() {} + function render($values) { - if ($entity = $this->get_value($values)) { + if ($entity = $this->get_entity($values)) { return $this->render_link($entity, $values); } }