Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / core / modules / media / src / Entity / Media.php

diff --git a/web/core/modules/media/src/Entity/Media.php b/web/core/modules/media/src/Entity/Media.php
index 49f7283f7e08701866621fd5d243ca9dd250fced..6e58771938840cf3d772b54f8f08b2fd66df76a3 100644 (file)
--- a/web/core/modules/media/src/Entity/Media.php
+++ b/web/core/modules/media/src/Entity/Media.php
@@ -31,7 +31,7 @@ use Drupal\user\UserInterface;
  *   handlers = {
  *     "storage" = "Drupal\Core\Entity\Sql\SqlContentEntityStorage",
  *     "view_builder" = "Drupal\Core\Entity\EntityViewBuilder",
- *     "list_builder" = "Drupal\Core\Entity\EntityListBuilder",
+ *     "list_builder" = "Drupal\media\MediaListBuilder",
  *     "access" = "Drupal\media\MediaAccessControlHandler",
  *     "form" = {
  *       "default" = "Drupal\media\MediaForm",
@@ -66,7 +66,7 @@ use Drupal\user\UserInterface;
  *     "revision_log_message" = "revision_log_message",
  *   },
  *   bundle_entity_type = "media_type",
- *   permission_granularity = "entity_type",
+ *   permission_granularity = "bundle",
  *   admin_permission = "administer media",
  *   field_ui_base_route = "entity.media_type.edit_form",
  *   common_reference_target = TRUE,
@@ -74,6 +74,7 @@ use Drupal\user\UserInterface;
  *     "add-page" = "/media/add",
  *     "add-form" = "/media/add/{media_type}",
  *     "canonical" = "/media/{media}",
+ *     "collection" = "/admin/content/media",
  *     "delete-form" = "/media/{media}/delete",
  *     "edit-form" = "/media/{media}/edit",
  *     "revision" = "/media/{media}/revisions/{media_revision}/view",
@@ -404,12 +405,7 @@ class Media extends EditorialContentEntityBase implements MediaInterface {
         'weight' => -5,
       ])
       ->setDisplayConfigurable('form', TRUE)
-      ->setDisplayConfigurable('view', TRUE)
-      ->setDisplayOptions('view', [
-        'label' => 'hidden',
-        'type' => 'string',
-        'weight' => -5,
-      ]);
+      ->setDisplayConfigurable('view', TRUE);
 
     $fields['thumbnail'] = BaseFieldDefinition::create('image')
       ->setLabel(t('Thumbnail'))