diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php index f2aa4bd..ac13757 100644 --- a/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php +++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php @@ -48,22 +48,12 @@ * "id" = "id", * "label" = "label", * "uuid" = "uuid" + * }, + * links = { + * "edit-form" = "admin/structure/display-modes/form/manage/{form_mode}" * } * ) */ class EntityFormMode extends EntityDisplayModeBase implements EntityFormModeInterface { - /** - * {@inheritdoc} - */ - public function uri() { - return array( - 'path' => 'admin/structure/display-modes/form/manage/' . $this->id(), - 'options' => array( - 'entity_type' => $this->entityType, - 'entity' => $this, - ), - ); - } - } diff --git a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php index e7f2a10..c46ef60 100644 --- a/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php +++ b/core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php @@ -49,22 +49,12 @@ * "id" = "id", * "label" = "label", * "uuid" = "uuid" + * }, + * links = { + * "edit-form" = "admin/structure/display-modes/view/manage/{view_mode}" * } * ) */ class EntityViewMode extends EntityDisplayModeBase implements EntityViewModeInterface { - /** - * {@inheritdoc} - */ - public function uri() { - return array( - 'path' => 'admin/structure/display-modes/view/manage/' . $this->id(), - 'options' => array( - 'entity_type' => $this->entityType, - 'entity' => $this, - ), - ); - } - } diff --git a/core/modules/node/lib/Drupal/node/Entity/NodeType.php b/core/modules/node/lib/Drupal/node/Entity/NodeType.php index cc6021c..caac324 100644 --- a/core/modules/node/lib/Drupal/node/Entity/NodeType.php +++ b/core/modules/node/lib/Drupal/node/Entity/NodeType.php @@ -36,6 +36,9 @@ * "id" = "type", * "label" = "name", * "uuid" = "uuid" + * }, + * links = { + * "edit-form" = "admin/structure/types/manage/{node_type}" * } * ) */ @@ -139,19 +142,6 @@ public function id() { /** * {@inheritdoc} */ - public function uri() { - return array( - 'path' => 'admin/structure/types/manage/' . $this->id(), - 'options' => array( - 'entity_type' => $this->entityType, - 'entity' => $this, - ), - ); - } - - /** - * {@inheritdoc} - */ public function getModuleSettings($module) { if (isset($this->settings[$module]) && is_array($this->settings[$module])) { return $this->settings[$module]; diff --git a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php index fb266fa..b42fbee 100644 --- a/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php +++ b/core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php @@ -36,6 +36,9 @@ * "id" = "id", * "label" = "label", * "uuid" = "uuid" + * }, + * links = { + * "edit-form" = "admin/config/media/picturemapping/{picture_mapping}" * } * ) */ @@ -162,17 +165,4 @@ public function hasMappings() { } return $mapping_found; } - - /** - * {@inheritdoc} - */ - public function uri() { - return array( - 'path' => 'admin/config/media/picturemapping/' . $this->id(), - 'options' => array( - 'entity_type' => $this->entityType, - 'entity' => $this, - ), - ); - } } diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php b/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php index 6ff6936..2994897 100644 --- a/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php +++ b/core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php @@ -37,6 +37,9 @@ * "id" = "id", * "label" = "label", * "uuid" = "uuid" + * }, + * links = { + * "edit-form" = "admin/config/user-interface/shortcut/manage/{shortcut_set}" * } * ) */ @@ -71,19 +74,6 @@ class ShortcutSet extends ConfigEntityBase implements ShortcutSetInterface { public $links = array(); /** - * Overrides \Drupal\Core\Entity\Entity::uri(). - */ - public function uri() { - return array( - 'path' => 'admin/config/user-interface/shortcut/manage/' . $this->id(), - 'options' => array( - 'entity_type' => $this->entityType, - 'entity' => $this, - ), - ); - } - - /** * {@inheritdoc} */ public function postCreate(EntityStorageControllerInterface $storage_controller) { diff --git a/core/modules/system/lib/Drupal/system/Entity/Action.php b/core/modules/system/lib/Drupal/system/Entity/Action.php index 5e3b575..8037c48 100644 --- a/core/modules/system/lib/Drupal/system/Entity/Action.php +++ b/core/modules/system/lib/Drupal/system/Entity/Action.php @@ -31,6 +31,9 @@ * "id" = "id", * "label" = "label", * "uuid" = "uuid" + * }, + * links = { + * "edit-form" = "admin/config/system/actions/configure/{action}" * } * ) */ @@ -140,19 +143,6 @@ public function getType() { /** * {@inheritdoc} */ - public function uri() { - return array( - 'path' => 'admin/config/system/actions/configure/' . $this->id(), - 'options' => array( - 'entity_type' => $this->entityType, - 'entity' => $this, - ), - ); - } - - /** - * {@inheritdoc} - */ public static function sort($a, $b) { $a_type = $a->getType(); $b_type = $b->getType(); diff --git a/core/modules/system/lib/Drupal/system/Entity/DateFormat.php b/core/modules/system/lib/Drupal/system/Entity/DateFormat.php index 7762b88..6034503 100644 --- a/core/modules/system/lib/Drupal/system/Entity/DateFormat.php +++ b/core/modules/system/lib/Drupal/system/Entity/DateFormat.php @@ -36,6 +36,9 @@ * "id" = "id", * "label" = "label", * "uuid" = "uuid" + * }, + * links = { + * "edit-form" = "admin/config/regional/date-time/formats/manage/{date_format}" * } * ) */ @@ -84,19 +87,6 @@ class DateFormat extends ConfigEntityBase implements DateFormatInterface { /** * {@inheritdoc} */ - public function uri() { - return array( - 'path' => 'admin/config/regional/date-time/formats/manage/' . $this->id(), - 'options' => array( - 'entity_type' => $this->entityType, - 'entity' => $this, - ), - ); - } - - /** - * {@inheritdoc} - */ public function getExportProperties() { $properties = parent::getExportProperties(); $names = array( diff --git a/core/modules/system/lib/Drupal/system/Entity/Menu.php b/core/modules/system/lib/Drupal/system/Entity/Menu.php index 7b2be7b..80799a2 100644 --- a/core/modules/system/lib/Drupal/system/Entity/Menu.php +++ b/core/modules/system/lib/Drupal/system/Entity/Menu.php @@ -28,6 +28,9 @@ * "id" = "id", * "label" = "label", * "uuid" = "uuid" + * }, + * links = { + * "edit-form" = "admin/structure/menu/manage/{menu}" * } * ) */ diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php index 8c20176..d1241a8 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php @@ -37,6 +37,9 @@ * "label" = "name", * "weight" = "weight", * "uuid" = "uuid" + * }, + * links = { + * "edit-form" = "admin/structure/taxonomy/manage/{taxonomy_vocabulary}" * } * ) */ @@ -99,19 +102,6 @@ public function id() { /** * {@inheritdoc} */ - public function uri() { - return array( - 'path' => 'admin/structure/taxonomy/manage/' . $this->id(), - 'options' => array( - 'entity_type' => $this->entityType, - 'entity' => $this, - ), - ); - } - - /** - * {@inheritdoc} - */ public function postSave(EntityStorageControllerInterface $storage_controller, $update = TRUE) { if (!$update) { entity_invoke_bundle_hook('create', 'taxonomy_term', $this->id());