Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
D
drupal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Custom Issue Tracker
Custom Issue Tracker
Labels
Merge Requests
294
Merge Requests
294
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
project
drupal
Commits
76bcb27b
Commit
76bcb27b
authored
Jan 31, 2014
by
alexpott
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue
#2167641
by tim.plunkett: EntityInterface::uri() should use route name and not path.
parent
87bff520
Changes
178
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
178 changed files
with
1085 additions
and
993 deletions
+1085
-993
core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
+16
-2
core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
.../Drupal/Core/Config/Entity/ConfigEntityListController.php
+4
-16
core/lib/Drupal/Core/Entity/Entity.php
core/lib/Drupal/Core/Entity/Entity.php
+83
-104
core/lib/Drupal/Core/Entity/EntityFormController.php
core/lib/Drupal/Core/Entity/EntityFormController.php
+9
-1
core/lib/Drupal/Core/Entity/EntityInterface.php
core/lib/Drupal/Core/Entity/EntityInterface.php
+61
-1
core/lib/Drupal/Core/Entity/EntityListController.php
core/lib/Drupal/Core/Entity/EntityListController.php
+4
-10
core/lib/Drupal/Core/Entity/EntityListControllerInterface.php
.../lib/Drupal/Core/Entity/EntityListControllerInterface.php
+1
-1
core/lib/Drupal/Core/Entity/EntityTypeInterface.php
core/lib/Drupal/Core/Entity/EntityTypeInterface.php
+4
-7
core/modules/action/action.module
core/modules/action/action.module
+1
-0
core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
.../modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
+6
-0
core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php
...s/aggregator/lib/Drupal/aggregator/FeedFormController.php
+1
-14
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
...ock/lib/Drupal/custom_block/CustomBlockFormController.php
+0
-21
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockListController.php
...ock/lib/Drupal/custom_block/CustomBlockListController.php
+0
-3
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeFormController.php
...lib/Drupal/custom_block/CustomBlockTypeFormController.php
+4
-15
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockTypeListController.php
...lib/Drupal/custom_block/CustomBlockTypeListController.php
+2
-2
core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
...stom_block/lib/Drupal/custom_block/Entity/CustomBlock.php
+1
-0
core/modules/block/custom_block/lib/Drupal/custom_block/Entity/CustomBlockType.php
..._block/lib/Drupal/custom_block/Entity/CustomBlockType.php
+1
-0
core/modules/block/lib/Drupal/block/BlockFormController.php
core/modules/block/lib/Drupal/block/BlockFormController.php
+0
-18
core/modules/block/lib/Drupal/block/Entity/Block.php
core/modules/block/lib/Drupal/block/Entity/Block.php
+1
-0
core/modules/book/book.module
core/modules/book/book.module
+4
-1
core/modules/book/lib/Drupal/book/Form/BookOutlineForm.php
core/modules/book/lib/Drupal/book/Form/BookOutlineForm.php
+2
-12
core/modules/comment/comment.module
core/modules/comment/comment.module
+42
-20
core/modules/comment/lib/Drupal/comment/CommentBreadcrumbBuilder.php
...s/comment/lib/Drupal/comment/CommentBreadcrumbBuilder.php
+2
-2
core/modules/comment/lib/Drupal/comment/CommentFormController.php
...ules/comment/lib/Drupal/comment/CommentFormController.php
+3
-4
core/modules/comment/lib/Drupal/comment/CommentManager.php
core/modules/comment/lib/Drupal/comment/CommentManager.php
+2
-3
core/modules/comment/lib/Drupal/comment/Controller/CommentController.php
...mment/lib/Drupal/comment/Controller/CommentController.php
+13
-9
core/modules/comment/lib/Drupal/comment/Entity/Comment.php
core/modules/comment/lib/Drupal/comment/Entity/Comment.php
+4
-4
core/modules/comment/lib/Drupal/comment/Form/CommentAdminOverview.php
.../comment/lib/Drupal/comment/Form/CommentAdminOverview.php
+8
-4
core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php
core/modules/comment/lib/Drupal/comment/Form/DeleteForm.php
+3
-3
core/modules/comment/lib/Drupal/comment/Plugin/views/field/Comment.php
...comment/lib/Drupal/comment/Plugin/views/field/Comment.php
+1
-2
core/modules/comment/lib/Drupal/comment/Plugin/views/field/Link.php
...es/comment/lib/Drupal/comment/Plugin/views/field/Link.php
+1
-2
core/modules/comment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php
...ment/lib/Drupal/comment/Plugin/views/field/LinkDelete.php
+1
-1
core/modules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
...dules/comment/lib/Drupal/comment/Plugin/views/row/Rss.php
+2
-2
core/modules/comment/lib/Drupal/comment/Tests/CommentTranslationUITest.php
...ent/lib/Drupal/comment/Tests/CommentTranslationUITest.php
+2
-2
core/modules/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
...s/config/lib/Drupal/config/Tests/ConfigEntityListTest.php
+6
-19
core/modules/config/lib/Drupal/config/Tests/ConfigEntityStatusUITest.php
...nfig/lib/Drupal/config/Tests/ConfigEntityStatusUITest.php
+3
-3
core/modules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
...dules/config/lib/Drupal/config/Tests/ConfigEntityTest.php
+11
-5
core/modules/config/tests/config_test/config_test.module
core/modules/config/tests/config_test/config_test.module
+2
-0
core/modules/config/tests/config_test/config_test.routing.yml
.../modules/config/tests/config_test/config_test.routing.yml
+15
-1
core/modules/config/tests/config_test/lib/Drupal/config_test/ConfigTestFormController.php
..._test/lib/Drupal/config_test/ConfigTestFormController.php
+0
-12
core/modules/config/tests/config_test/lib/Drupal/config_test/Entity/ConfigTest.php
.../config_test/lib/Drupal/config_test/Entity/ConfigTest.php
+4
-1
core/modules/config_translation/config_translation.module
core/modules/config_translation/config_translation.module
+2
-2
core/modules/contact/contact.module
core/modules/contact/contact.module
+10
-2
core/modules/contact/lib/Drupal/contact/CategoryFormController.php
...les/contact/lib/Drupal/contact/CategoryFormController.php
+5
-13
core/modules/contact/lib/Drupal/contact/Entity/Category.php
core/modules/contact/lib/Drupal/contact/Entity/Category.php
+1
-0
core/modules/contact/lib/Drupal/contact/MessageFormController.php
...ules/contact/lib/Drupal/contact/MessageFormController.php
+8
-2
core/modules/contact/lib/Drupal/contact/Tests/Views/ContactLinkTest.php
...ontact/lib/Drupal/contact/Tests/Views/ContactLinkTest.php
+1
-3
core/modules/content_translation/content_translation.module
core/modules/content_translation/content_translation.module
+1
-4
core/modules/content_translation/content_translation.pages.inc
...modules/content_translation/content_translation.pages.inc
+7
-13
core/modules/content_translation/lib/Drupal/content_translation/ContentTranslationController.php
...upal/content_translation/ContentTranslationController.php
+4
-5
core/modules/content_translation/lib/Drupal/content_translation/Form/ContentTranslationDeleteForm.php
...content_translation/Form/ContentTranslationDeleteForm.php
+2
-3
core/modules/content_translation/lib/Drupal/content_translation/Plugin/views/field/TranslationLink.php
...ontent_translation/Plugin/views/field/TranslationLink.php
+1
-2
core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationUITest.php
...al/content_translation/Tests/ContentTranslationUITest.php
+12
-16
core/modules/content_translation/lib/Drupal/content_translation/Tests/ContentTranslationWorkflowsTest.php
...ent_translation/Tests/ContentTranslationWorkflowsTest.php
+5
-8
core/modules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
...odules/entity/lib/Drupal/entity/Entity/EntityFormMode.php
+1
-0
core/modules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
...odules/entity/lib/Drupal/entity/Entity/EntityViewMode.php
+1
-0
core/modules/entity/lib/Drupal/entity/Form/EntityDisplayModeEditForm.php
...tity/lib/Drupal/entity/Form/EntityDisplayModeEditForm.php
+0
-13
core/modules/entity_reference/lib/Drupal/entity_reference/Plugin/Field/FieldFormatter/EntityReferenceLabelFormatter.php
...in/Field/FieldFormatter/EntityReferenceLabelFormatter.php
+4
-2
core/modules/field/lib/Drupal/field/Entity/FieldInstance.php
core/modules/field/lib/Drupal/field/Entity/FieldInstance.php
+5
-8
core/modules/field_ui/field_ui.module
core/modules/field_ui/field_ui.module
+12
-10
core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
.../field_ui/lib/Drupal/field_ui/Tests/ManageDisplayTest.php
+1
-1
core/modules/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
...s/field_ui/lib/Drupal/field_ui/Tests/ManageFieldsTest.php
+1
-1
core/modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
.../modules/filter/lib/Drupal/filter/Entity/FilterFormat.php
+2
-1
core/modules/forum/forum.module
core/modules/forum/forum.module
+7
-2
core/modules/forum/lib/Drupal/forum/Form/ForumFormController.php
...dules/forum/lib/Drupal/forum/Form/ForumFormController.php
+6
-14
core/modules/forum/lib/Drupal/forum/Form/Overview.php
core/modules/forum/lib/Drupal/forum/Form/Overview.php
+2
-2
core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
core/modules/forum/lib/Drupal/forum/Tests/ForumTest.php
+3
-3
core/modules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php
...odules/hal/lib/Drupal/hal/Normalizer/EntityNormalizer.php
+1
-2
core/modules/hal/lib/Drupal/hal/Tests/NormalizeTest.php
core/modules/hal/lib/Drupal/hal/Tests/NormalizeTest.php
+10
-2
core/modules/image/image.field.inc
core/modules/image/image.field.inc
+1
-0
core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
+1
-0
core/modules/image/lib/Drupal/image/Form/ImageEffectDeleteForm.php
...les/image/lib/Drupal/image/Form/ImageEffectDeleteForm.php
+2
-12
core/modules/image/lib/Drupal/image/Form/ImageEffectFormBase.php
...dules/image/lib/Drupal/image/Form/ImageEffectFormBase.php
+1
-6
core/modules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
...odules/image/lib/Drupal/image/Form/ImageStyleFormBase.php
+2
-7
core/modules/image/lib/Drupal/image/ImageStyleListController.php
...dules/image/lib/Drupal/image/ImageStyleListController.php
+1
-4
core/modules/image/lib/Drupal/image/Plugin/Field/FieldFormatter/ImageFormatter.php
...upal/image/Plugin/Field/FieldFormatter/ImageFormatter.php
+3
-1
core/modules/image/lib/Drupal/image/Tests/ImageAdminStylesTest.php
...les/image/lib/Drupal/image/Tests/ImageAdminStylesTest.php
+1
-2
core/modules/language/lib/Drupal/language/Entity/Language.php
.../modules/language/lib/Drupal/language/Entity/Language.php
+1
-0
core/modules/language/lib/Drupal/language/LanguageListController.php
...s/language/lib/Drupal/language/LanguageListController.php
+0
-10
core/modules/menu/lib/Drupal/menu/MenuFormController.php
core/modules/menu/lib/Drupal/menu/MenuFormController.php
+5
-21
core/modules/menu/lib/Drupal/menu/MenuListController.php
core/modules/menu/lib/Drupal/menu/MenuListController.php
+1
-4
core/modules/menu/menu.module
core/modules/menu/menu.module
+4
-1
core/modules/menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
...menu_link/lib/Drupal/menu_link/MenuLinkFormController.php
+0
-12
core/modules/menu_link/menu_link.module
core/modules/menu_link/menu_link.module
+2
-1
core/modules/node/lib/Drupal/node/Controller/NodeController.php
...odules/node/lib/Drupal/node/Controller/NodeController.php
+3
-3
core/modules/node/lib/Drupal/node/Entity/Node.php
core/modules/node/lib/Drupal/node/Entity/Node.php
+1
-0
core/modules/node/lib/Drupal/node/Entity/NodeType.php
core/modules/node/lib/Drupal/node/Entity/NodeType.php
+3
-1
core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php
core/modules/node/lib/Drupal/node/Form/NodeDeleteForm.php
+3
-2
core/modules/node/lib/Drupal/node/NodeFormController.php
core/modules/node/lib/Drupal/node/NodeFormController.php
+0
-21
core/modules/node/lib/Drupal/node/NodeListController.php
core/modules/node/lib/Drupal/node/NodeListController.php
+3
-2
core/modules/node/lib/Drupal/node/NodeTypeFormController.php
core/modules/node/lib/Drupal/node/NodeTypeFormController.php
+0
-12
core/modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
...modules/node/lib/Drupal/node/Plugin/Search/NodeSearch.php
+1
-2
core/modules/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php
...es/node/lib/Drupal/node/Plugin/views/field/LinkDelete.php
+1
-1
core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php
core/modules/node/lib/Drupal/node/Plugin/views/row/Rss.php
+1
-2
core/modules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php
...ules/node/lib/Drupal/node/Tests/NodeTranslationUITest.php
+4
-4
core/modules/node/lib/Drupal/node/Tests/NodeViewTest.php
core/modules/node/lib/Drupal/node/Tests/NodeViewTest.php
+1
-2
core/modules/node/node.module
core/modules/node/node.module
+5
-3
core/modules/options/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php
...ons/lib/Drupal/options/Tests/OptionsDynamicValuesTest.php
+1
-2
core/modules/options/tests/options_test.module
core/modules/options/tests/options_test.module
+1
-2
core/modules/path/path.module
core/modules/path/path.module
+3
-6
core/modules/picture/lib/Drupal/picture/Entity/PictureMapping.php
...ules/picture/lib/Drupal/picture/Entity/PictureMapping.php
+2
-1
core/modules/picture/lib/Drupal/picture/PictureMappingListController.php
...cture/lib/Drupal/picture/PictureMappingListController.php
+1
-4
core/modules/picture/lib/Drupal/picture/Plugin/Field/FieldFormatter/PictureFormatter.php
.../picture/Plugin/Field/FieldFormatter/PictureFormatter.php
+3
-1
core/modules/picture/picture.module
core/modules/picture/picture.module
+1
-0
core/modules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
...odules/rdf/lib/Drupal/rdf/Tests/CommentAttributesTest.php
+1
-2
core/modules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php
...ules/rdf/lib/Drupal/rdf/Tests/Field/FieldRdfaTestBase.php
+2
-2
core/modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php
.../modules/rdf/lib/Drupal/rdf/Tests/StandardProfileTest.php
+11
-25
core/modules/rdf/rdf.module
core/modules/rdf/rdf.module
+9
-9
core/modules/rest/lib/Drupal/rest/Routing/ResourceRoutes.php
core/modules/rest/lib/Drupal/rest/Routing/ResourceRoutes.php
+1
-1
core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
core/modules/rest/lib/Drupal/rest/Tests/UpdateTest.php
+1
-0
core/modules/search/lib/Drupal/search/Entity/SearchPage.php
core/modules/search/lib/Drupal/search/Entity/SearchPage.php
+5
-1
core/modules/search/lib/Drupal/search/Form/SearchPageFormBase.php
...ules/search/lib/Drupal/search/Form/SearchPageFormBase.php
+0
-12
core/modules/shortcut/lib/Drupal/shortcut/Entity/Shortcut.php
.../modules/shortcut/lib/Drupal/shortcut/Entity/Shortcut.php
+2
-1
core/modules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
...dules/shortcut/lib/Drupal/shortcut/Entity/ShortcutSet.php
+3
-1
core/modules/shortcut/lib/Drupal/shortcut/ShortcutFormController.php
...s/shortcut/lib/Drupal/shortcut/ShortcutFormController.php
+0
-10
core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetFormController.php
...hortcut/lib/Drupal/shortcut/ShortcutSetFormController.php
+1
-18
core/modules/shortcut/lib/Drupal/shortcut/ShortcutSetListController.php
...hortcut/lib/Drupal/shortcut/ShortcutSetListController.php
+1
-4
core/modules/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php
...s/shortcut/lib/Drupal/shortcut/Tests/ShortcutSetsTest.php
+1
-1
core/modules/shortcut/shortcut.routing.yml
core/modules/shortcut/shortcut.routing.yml
+2
-2
core/modules/system/entity.api.php
core/modules/system/entity.api.php
+1
-2
core/modules/system/lib/Drupal/system/Entity/DateFormat.php
core/modules/system/lib/Drupal/system/Entity/DateFormat.php
+1
-0
core/modules/system/lib/Drupal/system/Tests/Entity/EntityOperationsTest.php
...m/lib/Drupal/system/Tests/Entity/EntityOperationsTest.php
+1
-2
core/modules/system/lib/Drupal/system/Tests/Entity/EntityUriTest.php
...s/system/lib/Drupal/system/Tests/Entity/EntityUriTest.php
+0
-40
core/modules/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
...es/system/lib/Drupal/system/Tests/Menu/BreadcrumbTest.php
+1
-1
core/modules/system/tests/modules/entity_test/entity_test.module
...dules/system/tests/modules/entity_test/entity_test.module
+1
-2
core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Term.php
+1
-0
core/modules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
...odules/taxonomy/lib/Drupal/taxonomy/Entity/Vocabulary.php
+5
-1
core/modules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
...dules/taxonomy/lib/Drupal/taxonomy/Form/OverviewTerms.php
+10
-13
core/modules/taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php
...taxonomy/lib/Drupal/taxonomy/Form/VocabularyResetForm.php
+2
-10
core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldFormatter/LinkFormatter.php
...al/taxonomy/Plugin/Field/FieldFormatter/LinkFormatter.php
+4
-2
core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/Field/FieldFormatter/RSSCategoryFormatter.php
...nomy/Plugin/Field/FieldFormatter/RSSCategoryFormatter.php
+1
-3
core/modules/taxonomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
...onomy/lib/Drupal/taxonomy/Plugin/views/field/Taxonomy.php
+1
-2
core/modules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
...dules/taxonomy/lib/Drupal/taxonomy/TermFormController.php
+0
-15
core/modules/taxonomy/lib/Drupal/taxonomy/TermTranslationController.php
...axonomy/lib/Drupal/taxonomy/TermTranslationController.php
+1
-2
core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TaxonomyTermIndentationTest.php
...lib/Drupal/taxonomy/Tests/TaxonomyTermIndentationTest.php
+2
-2
core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermLanguageTest.php
...s/taxonomy/lib/Drupal/taxonomy/Tests/TermLanguageTest.php
+4
-4
core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php
core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php
+4
-4
core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
...onomy/lib/Drupal/taxonomy/Tests/TermTranslationUITest.php
+2
-2
core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyLanguageTest.php
...nomy/lib/Drupal/taxonomy/Tests/VocabularyLanguageTest.php
+6
-6
core/modules/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
...les/taxonomy/lib/Drupal/taxonomy/Tests/VocabularyTest.php
+1
-1
core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
...taxonomy/lib/Drupal/taxonomy/VocabularyFormController.php
+8
-18
core/modules/taxonomy/lib/Drupal/taxonomy/VocabularyListController.php
...taxonomy/lib/Drupal/taxonomy/VocabularyListController.php
+2
-8
core/modules/taxonomy/taxonomy.module
core/modules/taxonomy/taxonomy.module
+5
-3
core/modules/taxonomy/taxonomy.pages.inc
core/modules/taxonomy/taxonomy.pages.inc
+2
-3
core/modules/taxonomy/taxonomy.routing.yml
core/modules/taxonomy/taxonomy.routing.yml
+3
-3
core/modules/taxonomy/taxonomy.tokens.inc
core/modules/taxonomy/taxonomy.tokens.inc
+1
-2
core/modules/taxonomy/taxonomy.views.inc
core/modules/taxonomy/taxonomy.views.inc
+0
-27
core/modules/user/lib/Drupal/user/Entity/Role.php
core/modules/user/lib/Drupal/user/Entity/Role.php
+3
-1
core/modules/user/lib/Drupal/user/Entity/User.php
core/modules/user/lib/Drupal/user/Entity/User.php
+2
-1
core/modules/user/lib/Drupal/user/Form/UserCancelForm.php
core/modules/user/lib/Drupal/user/Form/UserCancelForm.php
+3
-2
core/modules/user/lib/Drupal/user/Form/UserPermissionsRoleSpecificForm.php
.../lib/Drupal/user/Form/UserPermissionsRoleSpecificForm.php
+7
-5
core/modules/user/lib/Drupal/user/Plugin/views/field/Link.php
.../modules/user/lib/Drupal/user/Plugin/views/field/Link.php
+1
-2
core/modules/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php
...es/user/lib/Drupal/user/Plugin/views/field/LinkCancel.php
+1
-2
core/modules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php
...ules/user/lib/Drupal/user/Plugin/views/field/LinkEdit.php
+1
-2
core/modules/user/lib/Drupal/user/Plugin/views/field/User.php
.../modules/user/lib/Drupal/user/Plugin/views/field/User.php
+1
-2
core/modules/user/lib/Drupal/user/ProfileTranslationController.php
...les/user/lib/Drupal/user/ProfileTranslationController.php
+1
-2
core/modules/user/lib/Drupal/user/RegisterFormController.php
core/modules/user/lib/Drupal/user/RegisterFormController.php
+3
-4
core/modules/user/lib/Drupal/user/RoleFormController.php
core/modules/user/lib/Drupal/user/RoleFormController.php
+7
-14
core/modules/user/lib/Drupal/user/RoleListController.php
core/modules/user/lib/Drupal/user/RoleListController.php
+5
-8
core/modules/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php
...es/user/lib/Drupal/user/Tests/UserEntityCallbacksTest.php
+6
-2
core/modules/user/user.module
core/modules/user/user.module
+4
-1
core/modules/user/user.routing.yml
core/modules/user/user.routing.yml
+2
-2
core/modules/views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
...views/lib/Drupal/views/Plugin/views/field/EntityLabel.php
+2
-2
core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardInterface.php
.../lib/Drupal/views/Plugin/views/wizard/WizardInterface.php
+1
-1
core/modules/views/lib/Drupal/views/Tests/Plugin/RowEntityTest.php
...les/views/lib/Drupal/views/Tests/Plugin/RowEntityTest.php
+1
-0
core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php
...odules/views_ui/lib/Drupal/views_ui/Form/Ajax/Analyze.php
+3
-4
core/modules/views_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php
...iews_ui/lib/Drupal/views_ui/Form/Ajax/ReorderDisplays.php
+4
-5
core/modules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php
...dules/views_ui/lib/Drupal/views_ui/Form/BreakLockForm.php
+2
-10
core/modules/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
...es/views_ui/lib/Drupal/views_ui/ViewAddFormController.php
+4
-5
core/modules/views_ui/lib/Drupal/views_ui/ViewCloneFormController.php
.../views_ui/lib/Drupal/views_ui/ViewCloneFormController.php
+1
-2
core/modules/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
...s/views_ui/lib/Drupal/views_ui/ViewEditFormController.php
+4
-9
core/modules/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php
...s/views_ui/lib/Drupal/views_ui/ViewFormControllerBase.php
+2
-2
core/modules/views_ui/lib/Drupal/views_ui/ViewListController.php
...dules/views_ui/lib/Drupal/views_ui/ViewListController.php
+8
-11
core/modules/views_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
...iews_ui/lib/Drupal/views_ui/ViewPreviewFormController.php
+3
-1
core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
core/modules/views_ui/lib/Drupal/views_ui/ViewUI.php
+25
-7
core/modules/views_ui/views_ui.module
core/modules/views_ui/views_ui.module
+8
-1
core/modules/views_ui/views_ui.routing.yml
core/modules/views_ui/views_ui.routing.yml
+12
-3
core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
core/tests/Drupal/Tests/Core/Entity/EntityUrlTest.php
+340
-0
No files found.
core/lib/Drupal/Core/Config/Entity/ConfigEntityBase.php
View file @
76bcb27b
...
...
@@ -207,8 +207,22 @@ public function preSave(EntityStorageControllerInterface $storage_controller) {
/**
* {@inheritdoc}
*/
public
function
uri
()
{
return
parent
::
uri
(
'edit-form'
);
public
function
urlInfo
(
$rel
=
'edit-form'
)
{
return
parent
::
urlInfo
(
$rel
);
}
/**
* {@inheritdoc}
*/
public
function
getSystemPath
(
$rel
=
'edit-form'
)
{
return
parent
::
getSystemPath
(
$rel
);
}
/**
* {@inheritdoc}
*/
public
function
url
(
$rel
=
'edit-form'
,
$options
=
array
())
{
return
parent
::
url
(
$rel
,
$options
);
}
}
core/lib/Drupal/Core/Config/Entity/ConfigEntityListController.php
View file @
76bcb27b
...
...
@@ -32,31 +32,19 @@ public function load() {
*/
public
function
getOperations
(
EntityInterface
$entity
)
{
$operations
=
parent
::
getOperations
(
$entity
);
$uri
=
$entity
->
uri
();
// Ensure the edit operation exists since it is access controlled.
if
(
isset
(
$operations
[
'edit'
]))
{
// For configuration entities edit path is the MENU_DEFAULT_LOCAL_TASK and
// therefore should be accessed by the short route.
$operations
[
'edit'
][
'href'
]
=
$uri
[
'path'
];
}
if
(
$this
->
entityType
->
hasKey
(
'status'
))
{
if
(
!
$entity
->
status
())
{
if
(
!
$entity
->
status
()
&&
$entity
->
hasLinkTemplate
(
'enable'
)
)
{
$operations
[
'enable'
]
=
array
(
'title'
=>
t
(
'Enable'
),
'href'
=>
$uri
[
'path'
]
.
'/enable'
,
'options'
=>
$uri
[
'options'
],
'weight'
=>
-
10
,
);
)
+
$entity
->
urlInfo
(
'enable'
)
;
}
else
{
else
if
(
$entity
->
hasLinkTemplate
(
'disable'
))
{
$operations
[
'disable'
]
=
array
(
'title'
=>
t
(
'Disable'
),
'href'
=>
$uri
[
'path'
]
.
'/disable'
,
'options'
=>
$uri
[
'options'
],
'weight'
=>
40
,
);
)
+
$entity
->
urlInfo
(
'disable'
)
;
}
}
...
...
core/lib/Drupal/Core/Entity/Entity.php
View file @
76bcb27b
...
...
@@ -9,7 +9,6 @@
use
Drupal\Core\Language\Language
;
use
Drupal\Core\Session\AccountInterface
;
use
Symfony\Component\Routing\Exception\RouteNotFoundException
;
/**
* Defines a base entity class.
...
...
@@ -38,18 +37,11 @@ abstract class Entity implements EntityInterface {
protected
$enforceIsNew
;
/**
* The
route provider service
.
* The
URL generator
.
*
* @var \Drupal\Core\Routing\
RouteProvide
rInterface
* @var \Drupal\Core\Routing\
UrlGenerato
rInterface
*/
protected
$routeProvider
;
/**
* Local cache for URI placeholder substitution values.
*
* @var array
*/
protected
$uriPlaceholderReplacements
;
protected
$urlGenerator
;
/**
* Constructs an Entity object.
...
...
@@ -127,99 +119,70 @@ public function label() {
}
/**
* Returns the URI elements of the entity.
*
* URI templates might be set in the links array in an annotation, for
* example:
* @code
* links = {
* "canonical" = "/node/{node}",
* "edit-form" = "/node/{node}/edit",
* "version-history" = "/node/{node}/revisions"
* }
* @endcode
* or specified in a callback function set like:
* @code
* uri_callback = "contact_category_uri",
* @endcode
* If the path is not set in the links array, the uri_callback function is
* used for setting the path. If this does not exist and the link relationship
* type is canonical, the path is set using the default template:
* entity/entityType/id.
*
* @param string $rel
* The link relationship type, for example: canonical or edit-form.
*
* @return array
* An array containing the 'path' and 'options' keys used to build the URI
* of the entity, and matching the signature of url().
* {@inheritdoc}
*/
public
function
uri
(
$rel
=
'canonical'
)
{
$entity_info
=
$this
->
getEntityType
();
public
function
urlInfo
(
$rel
=
'canonical'
)
{
if
(
$this
->
isNew
())
{
throw
new
EntityMalformedException
(
sprintf
(
'The "%s" entity type has not been saved, and cannot have a URI.'
,
$this
->
getEntityTypeId
()));
}
// The links array might contain URI templates set in annotations.
$link_templates
=
$this
->
linkTemplates
();
$template
=
NULL
;
if
(
isset
(
$link_templates
[
$rel
]))
{
try
{
$template
=
$this
->
routeProvider
()
->
getRouteByName
(
$link_templates
[
$rel
])
->
getPath
();
// If there is a template for the given relationship type, generate the path.
$uri
[
'route_name'
]
=
$link_templates
[
$rel
];
$uri
[
'route_parameters'
]
=
$this
->
urlRouteParameters
(
$rel
);
}
else
{
$bundle
=
$this
->
bundle
();
// A bundle-specific callback takes precedence over the generic one for
// the entity type.
$bundles
=
\
Drupal
::
entityManager
()
->
getBundleInfo
(
$this
->
getEntityTypeId
());
if
(
isset
(
$bundles
[
$bundle
][
'uri_callback'
]))
{
$uri_callback
=
$bundles
[
$bundle
][
'uri_callback'
];
}
catch
(
RouteNotFoundException
$e
)
{
// Fall back to a non-template-based URI.
elseif
(
$entity_uri_callback
=
$this
->
getEntityType
()
->
getUriCallback
()
)
{
$uri_callback
=
$entity_uri_callback
;
}
}
if
(
$template
)
{
// If there is a template for the given relationship type, do the
// placeholder replacement and use that as the path.
$replacements
=
$this
->
uriPlaceholderReplacements
();
$uri
[
'path'
]
=
str_replace
(
array_keys
(
$replacements
),
array_values
(
$replacements
),
$template
);
// @todo Remove this once http://drupal.org/node/1888424 is in and we can
// move the BC handling of / vs. no-/ to the generator.
$uri
[
'path'
]
=
trim
(
$uri
[
'path'
],
'/'
);
// Pass the entity data to url() so that alter functions do not need to
// look up this entity again.
$uri
[
'options'
][
'entity_type'
]
=
$this
->
entityTypeId
;
$uri
[
'options'
][
'entity'
]
=
$this
;
return
$uri
;
}
$bundle
=
$this
->
bundle
();
// A bundle-specific callback takes precedence over the generic one for
// the entity type.
$bundles
=
entity_get_bundles
(
$this
->
entityTypeId
);
if
(
isset
(
$bundles
[
$bundle
][
'uri_callback'
]))
{
$uri_callback
=
$bundles
[
$bundle
][
'uri_callback'
];
}
elseif
(
$entity_uri_callback
=
$entity_info
->
getUriCallback
())
{
$uri_callback
=
$entity_uri_callback
;
}
// Invoke the callback to get the URI. If there is no callback, use the
// default URI format.
// @todo Convert to is_callable() and call_user_func().
if
(
isset
(
$uri_callback
)
&&
function_exists
(
$uri_callback
))
{
$uri
=
$uri_callback
(
$this
);
}
// Only use these defaults for a canonical link (that is, a link to self).
// Other relationship types are not supported by this logic.
elseif
(
$rel
==
'canonical'
)
{
$uri
=
array
(
'path'
=>
'entity/'
.
$this
->
entityTypeId
.
'/'
.
$this
->
id
(),
);
}
else
{
return
array
();
// Invoke the callback to get the URI. If there is no callback, use the
// default URI format.
// @todo Convert to is_callable() and call_user_func().
if
(
isset
(
$uri_callback
)
&&
function_exists
(
$uri_callback
))
{
$uri
=
$uri_callback
(
$this
);
}
else
{
return
array
();
}
}
// Pass the entity data to url() so that alter functions do not need to
// look up this entity again.
$uri
[
'options'
][
'entity_type'
]
=
$this
->
getEntityTypeId
();
$uri
[
'options'
][
'entity'
]
=
$this
;
return
$uri
;
}
/**
* {@inheritdoc}
*/
public
function
getSystemPath
(
$rel
=
'canonical'
)
{
if
(
$uri
=
$this
->
urlInfo
(
$rel
))
{
return
$this
->
urlGenerator
()
->
getPathFromRoute
(
$uri
[
'route_name'
],
$uri
[
'route_parameters'
]);
}
return
''
;
}
/**
* {@inheritdoc}
*/
public
function
hasLinkTemplate
(
$rel
)
{
$link_templates
=
$this
->
linkTemplates
();
return
isset
(
$link_templates
[
$rel
]);
}
/**
* Returns an array link templates.
*
...
...
@@ -230,6 +193,20 @@ protected function linkTemplates() {
return
$this
->
getEntityType
()
->
getLinkTemplates
();
}
/**
* {@inheritdoc}
*/
public
function
url
(
$rel
=
'canonical'
,
$options
=
array
())
{
// While self::urlInfo() will throw an exception if the entity is new,
// the expected result for a URL is always a string.
if
(
$this
->
isNew
()
||
!
$uri
=
$this
->
urlInfo
(
$rel
))
{
return
''
;
}
$options
+=
$uri
[
'options'
];
return
$this
->
urlGenerator
()
->
generateFromRoute
(
$uri
[
'route_name'
],
$uri
[
'route_parameters'
],
$options
);
}
/**
* Returns an array of placeholders for this entity.
*
...
...
@@ -237,20 +214,22 @@ protected function linkTemplates() {
* placeholders if desired. If so, they should be sure to replicate the
* property caching logic.
*
* @param string $rel
* The link relationship type, for example: canonical or edit-form.
*
* @return array
* An array of URI placeholders.
*/
protected
function
uriPlaceholderReplacements
()
{
if
(
empty
(
$this
->
uriPlaceholderReplacements
))
{
$this
->
uriPlaceholderReplacements
=
array
(
'{entityType}'
=>
$this
->
getEntityTypeId
(),
'{bundle}'
=>
$this
->
bundle
(),
'{id}'
=>
$this
->
id
(),
'{uuid}'
=>
$this
->
uuid
(),
'{'
.
$this
->
getEntityTypeId
()
.
'}'
=>
$this
->
id
(),
);
protected
function
urlRouteParameters
(
$rel
)
{
// The entity ID is needed as a route parameter.
$uri_route_parameters
[
$this
->
getEntityTypeId
()]
=
$this
->
id
();
// The 'admin-form' link requires the bundle as a route parameter if the
// entity type uses bundles.
if
(
$rel
==
'admin-form'
&&
$this
->
getEntityType
()
->
getBundleEntityType
()
!=
'bundle'
)
{
$uri_route_parameters
[
$this
->
getEntityType
()
->
getBundleEntityType
()]
=
$this
->
bundle
();
}
return
$
this
->
uriPlaceholderReplacement
s
;
return
$
uri_route_parameter
s
;
}
/**
...
...
@@ -403,16 +382,16 @@ protected function onSaveOrDelete() {
}
/**
* Wraps the
route provider service
.
* Wraps the
URL generator
.
*
* @return \Drupal\Core\Routing\
RouteProvide
rInterface
* The
route provide
r.
* @return \Drupal\Core\Routing\
UrlGenerato
rInterface
* The
URL generato
r.
*/
protected
function
routeProvide
r
()
{
if
(
!
$this
->
routeProvide
r
)
{
$this
->
routeProvider
=
\
Drupal
::
service
(
'router.route_provider'
);
protected
function
urlGenerato
r
()
{
if
(
!
$this
->
urlGenerato
r
)
{
$this
->
urlGenerator
=
\
Drupal
::
urlGenerator
(
);
}
return
$this
->
routeProvide
r
;
return
$this
->
urlGenerato
r
;
}
}
core/lib/Drupal/Core/Entity/EntityFormController.php
View file @
76bcb27b
...
...
@@ -309,7 +309,15 @@ public function save(array $form, array &$form_state) {
* A reference to a keyed array containing the current state of the form.
*/
public
function
delete
(
array
$form
,
array
&
$form_state
)
{
// @todo Perform common delete operations.
if
(
$this
->
entity
->
hasLinkTemplate
(
'delete-form'
))
{
$form_state
[
'redirect_route'
]
=
$this
->
entity
->
urlInfo
(
'delete-form'
);
$query
=
$this
->
getRequest
()
->
query
;
if
(
$query
->
has
(
'destination'
))
{
$form_state
[
'redirect_route'
][
'options'
][
'query'
][
'destination'
]
=
$query
->
get
(
'destination'
);
$query
->
remove
(
'destination'
);
}
}
}
/**
...
...
core/lib/Drupal/Core/Entity/EntityInterface.php
View file @
76bcb27b
...
...
@@ -97,11 +97,71 @@ public function label();
/**
* Returns the URI elements of the entity.
*
* URI templates might be set in the links array in an annotation, for
* example:
* @code
* links = {
* "canonical" = "/node/{node}",
* "edit-form" = "/node/{node}/edit",
* "version-history" = "/node/{node}/revisions"
* }
* @endcode
* or specified in a callback function set like:
* @code
* uri_callback = "contact_category_uri",
* @endcode
* If the path is not set in the links array, the uri_callback function is
* used for setting the path. If this does not exist and the link relationship
* type is canonical, the path is set using the default template:
* entity/entityType/id.
*
* @param string $rel
* The link relationship type, for example: canonical or edit-form.
*
* @return
* An array containing the 'path' and 'options' keys used to build the URI
* of the entity, and matching the signature of url().
*/
public
function
uri
();
public
function
urlInfo
(
$rel
=
'canonical'
);
/**
* Returns the public URL for this entity.
*
* @param string $rel
* The link relationship type, for example: canonical or edit-form.
* @param array $options
* See \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute() for
* the available options.
*
* @return string
* The URL for this entity.
*/
public
function
url
(
$rel
=
'canonical'
,
$options
=
array
());
/**
* Returns the internal path for this entity.
*
* self::url() will return the full path including any prefixes, fragments, or
* query strings. This path does not include those.
*
* @param string $rel
* The link relationship type, for example: canonical or edit-form.
*
* @return string
* The internal path for this entity.
*/
public
function
getSystemPath
(
$rel
=
'canonical'
);
/**
* Indicates if a link template exists for a given key.
*
* @param string $key
* The link type.
*
* @return bool
* TRUE if the link template exists, FALSE otherwise.
*/
public
function
hasLinkTemplate
(
$key
);
/**
* Returns a list of URI relationships supported by this entity.
...
...
core/lib/Drupal/Core/Entity/EntityListController.php
View file @
76bcb27b
...
...
@@ -93,24 +93,18 @@ protected function getLabel(EntityInterface $entity) {
* {@inheritdoc}
*/
public
function
getOperations
(
EntityInterface
$entity
)
{
$uri
=
$entity
->
uri
();
$operations
=
array
();
if
(
$entity
->
access
(
'update'
))
{
if
(
$entity
->
access
(
'update'
)
&&
$entity
->
hasLinkTemplate
(
'edit-form'
)
)
{
$operations
[
'edit'
]
=
array
(
'title'
=>
$this
->
t
(
'Edit'
),
'href'
=>
$uri
[
'path'
]
.
'/edit'
,
'options'
=>
$uri
[
'options'
],
'weight'
=>
10
,
);
)
+
$entity
->
urlInfo
(
'edit-form'
)
;
}
if
(
$entity
->
access
(
'delete'
))
{
if
(
$entity
->
access
(
'delete'
)
&&
$entity
->
hasLinkTemplate
(
'delete-form'
)
)
{
$operations
[
'delete'
]
=
array
(
'title'
=>
$this
->
t
(
'Delete'
),
'href'
=>
$uri
[
'path'
]
.
'/delete'
,
'options'
=>
$uri
[
'options'
],
'weight'
=>
100
,
);
)
+
$entity
->
urlInfo
(
'delete-form'
)
;
}
return
$operations
;
...
...
core/lib/Drupal/Core/Entity/EntityListControllerInterface.php
View file @
76bcb27b
...
...
@@ -26,7 +26,7 @@ public function getStorageController();
* This allows the controller to manipulate the list, like filtering or
* sorting the loaded entities.
*
* @return
array
* @return
\Drupal\Core\Entity\EntityInterface[]
* An array of entities implementing Drupal\Core\Entity\EntityInterface.
*/
public
function
load
();
...
...
core/lib/Drupal/Core/Entity/EntityTypeInterface.php
View file @
76bcb27b
...
...
@@ -391,17 +391,14 @@ public function isFieldable();
* HTML page must also define an "edit-form" relationship.
*
* By default, the following placeholders are supported:
* - entityType: The machine name of the entity type.
* - bundle: The bundle machine name of the entity.
* - id: The unique ID of the entity.
* - uuid: The UUID of the entity.
* - [entityType]: The entity type itself will also be a valid token for the
* ID of the entity. For instance, a placeholder of {node} used on the Node
* class would have the same value as {id}. This is generally preferred
* over "id" for better self-documentation.
* class.
* - [bundleEntityType]: The bundle machine name itself. For instance, a
* placeholder of {node_type} used on the Node class.
*
* Specific entity types may also expand upon this list by overriding the
* Entity::ur
iPlaceholderReplacement
s() method.
* Entity::ur
lRouteParameter
s() method.
*
* @link http://www.iana.org/assignments/link-relations/link-relations.xml @endlink
* @link http://tools.ietf.org/html/rfc6570 @endlink
...
...
core/modules/action/action.module
View file @
76bcb27b
...
...
@@ -80,5 +80,6 @@ function action_entity_info(&$entity_info) {
->
setFormClass
(
'edit'
,
'Drupal\action\ActionEditFormController'
)
->
setFormClass
(
'delete'
,
'Drupal\action\Form\ActionDeleteForm'
)
->
setListClass
(
'Drupal\action\ActionListController'
)
->
setLinkTemplate
(
'delete-form'
,
'action.delete'
)
->
setLinkTemplate
(
'edit-form'
,
'action.admin_configure'
);
}
core/modules/aggregator/lib/Drupal/aggregator/Entity/Feed.php
View file @
76bcb27b
...
...
@@ -28,6 +28,12 @@
* "remove_items" = "Drupal\aggregator\Form\FeedItemsRemoveForm",
* }
* },
* links = {
* "canonical" = "aggregator.feed_view",
* "edit-form" = "aggregator.feed_configure",
* "delete-form" = "aggregator.feed_delete",
* "edit-form" = "aggregator.feed_configure",
* },
* base_table = "aggregator_feed",
* fieldable = TRUE,
* entity_keys = {
...
...
core/modules/aggregator/lib/Drupal/aggregator/FeedFormController.php
View file @
76bcb27b
...
...
@@ -92,10 +92,7 @@ public function save(array $form, array &$form_state) {
$form_state
[
'redirect_route'
][
'route_name'
]
=
'aggregator.admin_overview'
;
}
else
{
$form_state
[
'redirect_route'
]
=
array
(
'route_name'
=>
'aggregator.feed_view'
,
'route_parameters'
=>
array
(
'aggregator_feed'
=>
$feed
->
id
()),
);
$form_state
[
'redirect_route'
]
=
$feed
->
urlInfo
(
'canonical'
);
}
}
else
{
...
...
@@ -104,14 +101,4 @@ public function save(array $form, array &$form_state) {
}
}
/**
* {@inheritdoc}
*/
public
function
delete
(
array
$form
,
array
&
$form_state
)
{
$form_state
[
'redirect_route'
]
=
array
(
'route_name'
=>
'aggregator.feed_delete'
,
'route_parameters'
=>
array
(
'aggregator_feed'
=>
$this
->
entity
->
id
()),
);
}
}
core/modules/block/custom_block/lib/Drupal/custom_block/CustomBlockFormController.php
View file @
76bcb27b
...
...
@@ -248,27 +248,6 @@ public function save(array $form, array &$form_state) {
Cache
::
invalidateTags
(
array
(
'content'
=>
TRUE
));
}
/**
* {@inheritdoc}
*/
public
function
delete
(
array
$form
,
array
&
$form_state
)
{
$destination
=
array
();