Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Issue #2267753 by pwolanin, YesCT, Berdir: ContentEntityDatabaseStorage::mapToStorageRecord hard-codes $entity->$name->value." 

This reverts commit c16fbc5593.
8.0.x
Nathaniel Catchpole 2014-05-20 11:12:45 +01:00
parent 576027518b
commit 51edc990be
4 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/lib/Drupal/Core/Entity/ContentEntityDatabaseStorage.php
View File

@ -587,7 +587,7 @@ class ContentEntityDatabaseStorage extends ContentEntityStorageBase {
/**
* Maps from an entity object to the storage record.
*
* @param \Drupal\Core\Entity\ContentEntityInterface $entity
* @param \Drupal\Core\Entity\EntityInterface $entity
* The entity object.
* @param string $table_key
* (optional) The entity key identifying the target table. Defaults to
@ -596,9 +596,10 @@ class ContentEntityDatabaseStorage extends ContentEntityStorageBase {
* @return \stdClass
* The record to store.
*/
protected function mapToStorageRecord(ContentEntityInterface $entity, $table_key = 'base_table') {
protected function mapToStorageRecord(EntityInterface $entity, $table_key = 'base_table') {
$record = new \stdClass();
$values = array();
$definitions = $entity->getFieldDefinitions();
$schema = drupal_get_schema($this->entityType->get($table_key));
$is_new = $entity->isNew();
@ -610,23 +611,7 @@ class ContentEntityDatabaseStorage extends ContentEntityStorageBase {
$multi_column_fields[$field] = TRUE;
continue;
}
$values[$name] = NULL;
if ($entity->hasField($name)) {
// Only the first field item is stored.
$field_item = $entity->get($name)->first();
$main_property = $entity->getFieldDefinition($name)->getMainPropertyName();
if ($main_property && isset($field_item->$main_property)) {
// If the field has a main property, store the value of that.
$values[$name] = $field_item->$main_property;
}
elseif (!$main_property) {
// If there is no main property, get all properties from the first
// field item and assume that they will be stored serialized.
// @todo Give field types more control over this behavior in
// https://drupal.org/node/2232427.
$values[$name] = $field_item->getValue();
}
}
$values[$name] = isset($definitions[$name]) && isset($entity->$name->value) ? $entity->$name->value : NULL;
}
// Handle fields that store multiple properties and match each property name

15
core/lib/Drupal/Core/Field/Plugin/Field/FieldType/MapItem.php
View File

@ -104,19 +104,4 @@ class MapItem extends FieldItemBase {
}
}
/**
* {@inheritdoc}
*/
public static function mainPropertyName() {
// A map item has no main property.
return NULL;
}
/**
* {@inheritdoc}
*/
public function isEmpty() {
return empty($this->values);
}
}

5
core/modules/shortcut/src/Entity/Shortcut.php
View File

@ -100,14 +100,15 @@ class Shortcut extends ContentEntityBase implements ShortcutInterface {
* {@inheritdoc}
*/
public function getRouteParams() {
return $this->get('route_parameters')->first()->getValue();
$value = $this->get('route_parameters')->getValue();
return reset($value);
}
/**
* {@inheritdoc}
*/
public function setRouteParams($route_parameters) {
$this->set('route_parameters', array($route_parameters));
$this->set('route_parameters', array('value' => $route_parameters));
return $this;
}

14
core/modules/shortcut/src/Tests/ShortcutLinksTest.php
View File

@ -2,7 +2,7 @@
/**
* @file
* Contains \Drupal\shortcut\Tests\ShortcutLinksTest.
* Definition of Drupal\shortcut\Tests\ShortcutLinksTest.
*/
namespace Drupal\shortcut\Tests;
@ -66,18 +66,6 @@ class ShortcutLinksTest extends ShortcutTestBase {
$this->assertTrue(in_array($this->container->get('path.alias_manager')->getPathByAlias($test['path']), $paths), 'Shortcut created: ' . $test['path']);
$this->assertLink($title, 0, 'Shortcut link found on the page.');
}
$saved_set = shortcut_set_load($set->id());
// Test that saving and re-loading a shortcut preserves its values.
$shortcuts = $saved_set->getShortcuts();
foreach ($shortcuts as $entity) {
// Test the node routes with parameters.
if (strpos($entity->route_name->value, 'node.') === 0) {
$entity->save();
$loaded = entity_load('shortcut', $entity->id());
$this->assertEqual($entity->route_name->value, $loaded->route_name->value);
$this->assertEqual($entity->get('route_parameters')->first()->getValue(), $loaded->get('route_parameters')->first()->getValue());
}
}
}
/**