X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fcontent_translation%2Fsrc%2FRouting%2FContentTranslationRouteSubscriber.php;h=6cd3b350dfe80009660fc218409b9e638e5d4a0a;hb=9424afc6c1f518c301bf87a23c047d1873435d05;hp=6aae426abe31116bcf24c8aa7265178f3c3d0e92;hpb=a2bd1bf0c2c1f1a17d188f4dc0726a45494cefae;p=yaffs-website

diff --git a/web/core/modules/content_translation/src/Routing/ContentTranslationRouteSubscriber.php b/web/core/modules/content_translation/src/Routing/ContentTranslationRouteSubscriber.php
index 6aae426ab..6cd3b350d 100644
--- a/web/core/modules/content_translation/src/Routing/ContentTranslationRouteSubscriber.php
+++ b/web/core/modules/content_translation/src/Routing/ContentTranslationRouteSubscriber.php
@@ -2,6 +2,7 @@
 
 namespace Drupal\content_translation\Routing;
 
+use Drupal\content_translation\ContentTranslationManager;
 use Drupal\content_translation\ContentTranslationManagerInterface;
 use Drupal\Core\Routing\RouteSubscriberBase;
 use Drupal\Core\Routing\RoutingEvents;
@@ -35,18 +36,6 @@ class ContentTranslationRouteSubscriber extends RouteSubscriberBase {
    */
   protected function alterRoutes(RouteCollection $collection) {
     foreach ($this->contentTranslationManager->getSupportedEntityTypes() as $entity_type_id => $entity_type) {
-      // Try to get the route from the current collection.
-      $link_template = $entity_type->getLinkTemplate('canonical');
-      if (strpos($link_template, '/') !== FALSE) {
-        $base_path = '/' . $link_template;
-      }
-      else {
-        if (!$entity_route = $collection->get("entity.$entity_type_id.canonical")) {
-          continue;
-        }
-        $base_path = $entity_route->getPath();
-      }
-
       // Inherit admin route status from edit route, if exists.
       $is_admin = FALSE;
       $route_name = "entity.$entity_type_id.edit_form";
@@ -54,110 +43,130 @@ class ContentTranslationRouteSubscriber extends RouteSubscriberBase {
         $is_admin = (bool) $edit_route->getOption('_admin_route');
       }
 
-      $path = $base_path . '/translations';
+      $load_latest_revision = ContentTranslationManager::isPendingRevisionSupportEnabled($entity_type_id);
 
-      $route = new Route(
-        $path,
-        [
-          '_controller' => '\Drupal\content_translation\Controller\ContentTranslationController::overview',
-          'entity_type_id' => $entity_type_id,
-        ],
-        [
-          '_entity_access' => $entity_type_id . '.view',
-          '_access_content_translation_overview' => $entity_type_id,
-        ],
-        [
-          'parameters' => [
-            $entity_type_id => [
-              'type' => 'entity:' . $entity_type_id,
-            ],
+      if ($entity_type->hasLinkTemplate('drupal:content-translation-overview')) {
+        $route = new Route(
+          $entity_type->getLinkTemplate('drupal:content-translation-overview'),
+          [
+            '_controller' => '\Drupal\content_translation\Controller\ContentTranslationController::overview',
+            'entity_type_id' => $entity_type_id,
+          ],
+          [
+            '_entity_access' => $entity_type_id . '.view',
+            '_access_content_translation_overview' => $entity_type_id,
           ],
-          '_admin_route' => $is_admin,
-        ]
-      );
-      $route_name = "entity.$entity_type_id.content_translation_overview";
-      $collection->add($route_name, $route);
+          [
+            'parameters' => [
+              $entity_type_id => [
+                'type' => 'entity:' . $entity_type_id,
+                'load_latest_revision' => $load_latest_revision,
+              ],
+            ],
+            '_admin_route' => $is_admin,
+          ]
+        );
+        $route_name = "entity.$entity_type_id.content_translation_overview";
+        $collection->add($route_name, $route);
+      }
 
-      $route = new Route(
-        $path . '/add/{source}/{target}',
-        [
-          '_controller' => '\Drupal\content_translation\Controller\ContentTranslationController::add',
-          'source' => NULL,
-          'target' => NULL,
-          '_title' => 'Add',
-          'entity_type_id' => $entity_type_id,
+      if ($entity_type->hasLinkTemplate('drupal:content-translation-add')) {
+        $route = new Route(
+          $entity_type->getLinkTemplate('drupal:content-translation-add'),
+          [
+            '_controller' => '\Drupal\content_translation\Controller\ContentTranslationController::add',
+            'source' => NULL,
+            'target' => NULL,
+            '_title' => 'Add',
+            'entity_type_id' => $entity_type_id,
 
-        ],
-        [
-          '_entity_access' => $entity_type_id . '.view',
-          '_access_content_translation_manage' => 'create',
-        ],
-        [
-          'parameters' => [
-            'source' => [
-              'type' => 'language',
-            ],
-            'target' => [
-              'type' => 'language',
-            ],
-            $entity_type_id => [
-              'type' => 'entity:' . $entity_type_id,
-            ],
           ],
-          '_admin_route' => $is_admin,
-        ]
-      );
-      $collection->add("entity.$entity_type_id.content_translation_add", $route);
-
-      $route = new Route(
-        $path . '/edit/{language}',
-        [
-          '_controller' => '\Drupal\content_translation\Controller\ContentTranslationController::edit',
-          'language' => NULL,
-          '_title' => 'Edit',
-          'entity_type_id' => $entity_type_id,
-        ],
-        [
-          '_access_content_translation_manage' => 'update',
-        ],
-        [
-          'parameters' => [
-            'language' => [
-              'type' => 'language',
-            ],
-            $entity_type_id => [
-              'type' => 'entity:' . $entity_type_id,
-            ],
+          [
+            '_entity_access' => $entity_type_id . '.view',
+            '_access_content_translation_manage' => 'create',
           ],
-          '_admin_route' => $is_admin,
-        ]
-      );
-      $collection->add("entity.$entity_type_id.content_translation_edit", $route);
-
-      $route = new Route(
-        $path . '/delete/{language}',
-        [
-          '_entity_form' => $entity_type_id . '.content_translation_deletion',
-          'language' => NULL,
-          '_title' => 'Delete',
-          'entity_type_id' => $entity_type_id,
-        ],
-        [
-          '_access_content_translation_manage' => 'delete',
-        ],
-        [
-          'parameters' => [
-            'language' => [
-              'type' => 'language',
+          [
+            'parameters' => [
+              'source' => [
+                'type' => 'language',
+              ],
+              'target' => [
+                'type' => 'language',
+              ],
+              $entity_type_id => [
+                'type' => 'entity:' . $entity_type_id,
+                'load_latest_revision' => $load_latest_revision,
+              ],
             ],
-            $entity_type_id => [
-              'type' => 'entity:' . $entity_type_id,
+            '_admin_route' => $is_admin,
+          ]
+        );
+        $collection->add("entity.$entity_type_id.content_translation_add", $route);
+      }
+
+      if ($entity_type->hasLinkTemplate('drupal:content-translation-edit')) {
+        $route = new Route(
+          $entity_type->getLinkTemplate('drupal:content-translation-edit'),
+          [
+            '_controller' => '\Drupal\content_translation\Controller\ContentTranslationController::edit',
+            'language' => NULL,
+            '_title' => 'Edit',
+            'entity_type_id' => $entity_type_id,
+          ],
+          [
+            '_access_content_translation_manage' => 'update',
+          ],
+          [
+            'parameters' => [
+              'language' => [
+                'type' => 'language',
+              ],
+              $entity_type_id => [
+                'type' => 'entity:' . $entity_type_id,
+                'load_latest_revision' => $load_latest_revision,
+              ],
             ],
+            '_admin_route' => $is_admin,
+          ]
+        );
+        $collection->add("entity.$entity_type_id.content_translation_edit", $route);
+      }
+
+      if ($entity_type->hasLinkTemplate('drupal:content-translation-delete')) {
+        $route = new Route(
+          $entity_type->getLinkTemplate('drupal:content-translation-delete'),
+          [
+            '_entity_form' => $entity_type_id . '.content_translation_deletion',
+            'language' => NULL,
+            '_title' => 'Delete',
+            'entity_type_id' => $entity_type_id,
           ],
-          '_admin_route' => $is_admin,
-        ]
-      );
-      $collection->add("entity.$entity_type_id.content_translation_delete", $route);
+          [
+            '_access_content_translation_manage' => 'delete',
+          ],
+          [
+            'parameters' => [
+              'language' => [
+                'type' => 'language',
+              ],
+              $entity_type_id => [
+                'type' => 'entity:' . $entity_type_id,
+                'load_latest_revision' => $load_latest_revision,
+              ],
+            ],
+            '_admin_route' => $is_admin,
+          ]
+        );
+        $collection->add("entity.$entity_type_id.content_translation_delete", $route);
+      }
+
+      // Add our custom translation deletion access checker.
+      if ($load_latest_revision) {
+        $entity_delete_route = $collection->get("entity.$entity_type_id.delete_form");
+        if ($entity_delete_route) {
+          $entity_delete_route->addRequirements(['_access_content_translation_delete' => "$entity_type_id.delete"]);
+        }
+      }
     }
   }