diff --git a/entity.api.php b/entity.api.php
index 45f130d..85d396f 100644
--- a/entity.api.php
+++ b/entity.api.php
@@ -119,6 +119,13 @@
* Override the controller class to adapt the defaults and to improve and
* complete the generated metadata. Set it to FALSE to disable this feature.
* Defaults to the EntityDefaultMetadataController class.
+ * - extra fields controller class: (optional) A controller class for providing
+ * field API extra fields. Defaults to none.
+ * The class must implement the EntityExtraFieldsControllerInterface. Display
+ * extra fields that are exposed that way are rendered by default by the
+ * EntityAPIController. The EntityDefaultExtraFieldsController class may be
+ * used to generate extra fields based upon property metadata, which in turn
+ * get rendered by default by the EntityAPIController.
* - features controller class: (optional) A controller class for providing
* Features module integration for exportable entities. The given class has to
* inherit from the default class being EntityDefaultFeaturesController. Set
diff --git a/entity.info.inc b/entity.info.inc
index 1f626cc..b86f167 100644
--- a/entity.info.inc
+++ b/entity.info.inc
@@ -179,3 +179,84 @@ function _entity_metadata_convert_schema_type($type) {
return 'text';
}
}
+
+/**
+ * Interface for extra fields controller.
+ *
+ * Note: Displays extra fields exposed by this controller are rendered by
+ * default by the EntityAPIController.
+ */
+interface EntityExtraFieldsControllerInterface {
+
+ /**
+ * Returns extra fields for this entity type.
+ *
+ * @see hook_field_extra_fields().
+ */
+ public function fieldExtraFields();
+}
+
+/**
+ * Default controller for generating extra fields based on property metadata.
+ *
+ * By default a display extra field for each property not being a field, ID or
+ * bundle is generated.
+ */
+class EntityDefaultExtraFieldsController implements EntityExtraFieldsControllerInterface {
+
+ /**
+ * @var string
+ */
+ protected $entityType;
+
+ /**
+ * @var array
+ */
+ protected $entityInfo;
+
+ /**
+ * Constructor.
+ */
+ public function __construct($type) {
+ $this->entityType = $type;
+ $this->entityInfo = entity_get_info($type);
+ $this->propertyInfo = entity_get_property_info($type);
+ }
+
+ /**
+ * Implements EntityExtraFieldsControllerInterface::fieldExtraFields().
+ */
+ public function fieldExtraFields() {
+ $extra = array();
+ foreach ($this->propertyInfo['properties'] as $name => $property_info) {
+ // Skip adding the ID or bundle.
+ if ($this->entityInfo['entity keys']['id'] == $name || $this->entityInfo['entity keys']['bundle'] == $name) {
+ continue;
+ }
+ $extra[$this->entityType][$this->entityType]['display'][$name] = $this->generateExtraFieldInfo($name, $property_info);
+ }
+
+ // Handle bundle properties.
+ $this->propertyInfo += array('bundles' => array());
+ foreach ($this->propertyInfo['bundles'] as $bundle_name => $info) {
+ foreach ($info['properties'] as $name => $property_info) {
+ $extra[$this->entityType][$bundle_name]['display'][$name] = $this->generateExtraFieldInfo($name, $property_info);
+ }
+ }
+ return $extra;
+ }
+
+ /**
+ * Generates the display field info for a given property.
+ */
+ protected function generateExtraFieldInfo($name, $property_info) {
+ $info = array(
+ 'label' => $property_info['label'],
+ 'weight' => 0,
+ );
+ if (!empty($property_info['description'])) {
+ $info['description'] = $property_info['description'];
+ }
+ return $info;
+ }
+}
diff --git a/entity.module b/entity.module
index 81ad379..30030b4 100644
--- a/entity.module
+++ b/entity.module
@@ -971,11 +971,18 @@ function entity_theme() {
return array(
'entity_status' => array(
'variables' => array('status' => NULL, 'html' => TRUE),
+ 'file' => 'theme/entity.theme.inc',
),
'entity' => array(
'render element' => 'elements',
'template' => 'entity',
'pattern' => $pattern,
+ 'path' => drupal_get_path('module', 'entity') . '/theme',
+ 'file' => 'entity.theme.inc',
+ ),
+ 'entity_property' => array(
+ 'render element' => 'elements',
+ 'file' => 'theme/entity.theme.inc',
),
'entity_ui_overview_item' => array(
'variables' => array('label' => NULL, 'entity_type' => NULL, 'url' => FALSE, 'name' => FALSE),
@@ -985,90 +992,6 @@ function entity_theme() {
}
/**
- * Themes the exportable status of an entity.
- */
-function theme_entity_status($variables) {
- $status = $variables['status'];
- $html = $variables['html'];
- if (($status & ENTITY_FIXED) == ENTITY_FIXED) {
- $label = t('Fixed');
- $help = t('The configuration is fixed and cannot be changed.');
- return $html ? "" . $label . "" : $label;
- }
- elseif (($status & ENTITY_OVERRIDDEN) == ENTITY_OVERRIDDEN) {
- $label = t('Overridden');
- $help = t('This configuration is provided by a module, but has been changed.');
- return $html ? "" . $label . "" : $label;
- }
- elseif ($status & ENTITY_IN_CODE) {
- $label = t('Default');
- $help = t('A module provides this configuration.');
- return $html ? "" . $label . "" : $label;
- }
- elseif ($status & ENTITY_CUSTOM) {
- $label = t('Custom');
- $help = t('A custom configuration by a user.');
- return $html ? "" . $label . "" : $label;
- }
-}
-
-/**
- * Process variables for entity.tpl.php.
- */
-function template_preprocess_entity(&$variables) {
- $variables['view_mode'] = $variables['elements']['#view_mode'];
- $entity_type = $variables['elements']['#entity_type'];
- $variables['entity_type'] = $entity_type;
- $entity = $variables['elements']['#entity'];
- $variables[$variables['elements']['#entity_type']] = $entity;
- $info = entity_get_info($entity_type);
-
- $variables['title'] = check_plain(entity_label($entity_type, $entity));
-
- $uri = entity_uri($entity_type, $entity);
- $variables['url'] = $uri ? url($uri['path'], $uri['options']) : FALSE;
-
- if (isset($variables['elements']['#page'])) {
- // If set by the caller, respect the page property.
- $variables['page'] = $variables['elements']['#page'];
- }
- else {
- // Else, try to automatically detect it.
- $variables['page'] = $uri && $uri['path'] == $_GET['q'];
- }
-
- // Helpful $content variable for templates.
- $variables['content'] = array();
- foreach (element_children($variables['elements']) as $key) {
- $variables['content'][$key] = $variables['elements'][$key];
- }
-
- if (!empty($info['fieldable'])) {
- // Make the field variables available with the appropriate language.
- field_attach_preprocess($entity_type, $entity, $variables['content'], $variables);
- }
- list(, , $bundle) = entity_extract_ids($entity_type, $entity);
-
- // Gather css classes.
- $variables['classes_array'][] = drupal_html_class('entity-' . $entity_type);
- $variables['classes_array'][] = drupal_html_class($entity_type . '-' . $bundle);
-
- // Add RDF type and about URI.
- if (module_exists('rdf')) {
- $variables['attributes_array']['about'] = empty($uri['path']) ? NULL: url($uri['path']);
- $variables['attributes_array']['typeof'] = empty($entity->rdf_mapping['rdftype']) ? NULL : $entity->rdf_mapping['rdftype'];
- }
-
- // Add suggestions.
- $variables['theme_hook_suggestions'][] = $entity_type;
- $variables['theme_hook_suggestions'][] = $entity_type . '__' . $bundle;
- $variables['theme_hook_suggestions'][] = $entity_type . '__' . $bundle . '__' . $variables['view_mode'];
- if ($id = entity_id($entity_type, $entity)) {
- $variables['theme_hook_suggestions'][] = $entity_type . '__' . $id;
- }
-}
-
-/**
* Label callback that refers to the entity classes label method.
*/
function entity_class_label($entity) {
@@ -1246,6 +1169,39 @@ function entity_views_api() {
}
/**
+ * Implements hook_field_extra_fields().
+ */
+function entity_field_extra_fields() {
+ // Invoke specified controllers for entity types provided by the CRUD API.
+ $items = array();
+ foreach (entity_crud_get_info() as $type => $info) {
+ if (!empty($info['extra fields controller class'])) {
+ $items = array_merge_recursive($items, entity_get_extra_fields_controller($type)->fieldExtraFields());
+ }
+ }
+ return $items;
+}
+
+/**
+ * Gets the extra field controller class for a given entity type.
+ *
+ * @return EntityExtraFieldsControllerInterface|false
+ * The controller for the given entity type or FALSE if none is specified.
+ */
+function entity_get_extra_fields_controller($type = NULL) {
+ $static = &drupal_static(__FUNCTION__);
+
+ if (!isset($static[$type])) {
+ $static[$type] = FALSE;
+ $info = entity_get_info($type);
+ if (!empty($info['extra fields controller class'])) {
+ $static[$type] = new $info['extra fields controller class']($type);
+ }
+ }
+ return $static[$type];
+}
+
+/**
* Returns a property wrapper for the given data.
*
* If an entity is wrapped, the wrapper can be used to retrieve further wrappers
diff --git a/entity.tpl.php b/entity.tpl.php
deleted file mode 100644
index cfe94dd..0000000
--- a/entity.tpl.php
+++ /dev/null
@@ -1,48 +0,0 @@
-
->
-
-
-
>
-
-
-
-
-
-
-
-
- >
-
-
->
+
+
+
>
+
+
+
+
+
+
+
+
+ >
+
+
+