From cc931cec9ea46ff9408d881ae9a7fa779f1535d6 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Tue, 5 Aug 2014 10:37:08 +0100
Subject: [PATCH] Issue #2314885 by undertext, Crell: Standardize search page
 entity route names.

---
 core/modules/search/search.routing.yml            | 10 +++++-----
 core/modules/search/src/Entity/SearchPage.php     | 10 +++++-----
 core/modules/search/src/SearchPageListBuilder.php |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/modules/search/search.routing.yml b/core/modules/search/search.routing.yml
index 38afb9f731cb..479ebe8b4d71 100644
--- a/core/modules/search/search.routing.yml
+++ b/core/modules/search/search.routing.yml
@@ -22,7 +22,7 @@ search.add_type:
   requirements:
     _entity_create_access: 'search_page'
 
-search.edit:
+entity.search_page.edit_form:
   path: '/admin/config/search/pages/manage/{search_page}'
   defaults:
     _entity_form: 'search_page.edit'
@@ -30,7 +30,7 @@ search.edit:
   requirements:
     _entity_access: 'search_page.update'
 
-search.enable:
+entity.search_page.enable:
   path: '/admin/config/search/pages/manage/{search_page}/enable'
   defaults:
     _controller: '\Drupal\search\Controller\SearchController::performOperation'
@@ -38,7 +38,7 @@ search.enable:
   requirements:
     _entity_access: 'search_page.update'
 
-search.disable:
+entity.search_page.disable:
   path: '/admin/config/search/pages/manage/{search_page}/disable'
   defaults:
     _controller: '\Drupal\search\Controller\SearchController::performOperation'
@@ -46,14 +46,14 @@ search.disable:
   requirements:
     _entity_access: 'search_page.disable'
 
-search.set_default:
+entity.search_page.set_default:
   path: '/admin/config/search/pages/manage/{search_page}/set-default'
   defaults:
     _controller: '\Drupal\search\Controller\SearchController::setAsDefault'
   requirements:
     _entity_access: 'search_page.update'
 
-search.delete:
+entity.search_page.delete_form:
   path: '/admin/config/search/pages/manage/{search_page}/delete'
   defaults:
     _entity_form: 'search_page.delete'
diff --git a/core/modules/search/src/Entity/SearchPage.php b/core/modules/search/src/Entity/SearchPage.php
index 7341221b1b3a..b46c737bb9f8 100644
--- a/core/modules/search/src/Entity/SearchPage.php
+++ b/core/modules/search/src/Entity/SearchPage.php
@@ -35,11 +35,11 @@ use Drupal\search\SearchPageInterface;
  *   },
  *   admin_permission = "administer search",
  *   links = {
- *     "edit-form" = "search.edit",
- *     "delete-form" = "search.delete",
- *     "enable" = "search.enable",
- *     "disable" = "search.disable",
- *     "set-default" = "search.set_default"
+ *     "edit-form" = "entity.search_page.edit_form",
+ *     "delete-form" = "entity.search_page.delete_form",
+ *     "enable" = "entity.search_page.enable",
+ *     "disable" = "entity.search_page.disable",
+ *     "set-default" = "entity.search_page.set_default"
  *   },
  *   config_prefix = "page",
  *   entity_keys = {
diff --git a/core/modules/search/src/SearchPageListBuilder.php b/core/modules/search/src/SearchPageListBuilder.php
index dceec66c76a0..c54bbefbc8d0 100644
--- a/core/modules/search/src/SearchPageListBuilder.php
+++ b/core/modules/search/src/SearchPageListBuilder.php
@@ -305,7 +305,7 @@ class SearchPageListBuilder extends DraggableListBuilder implements FormInterfac
     else {
       $operations['default'] = array(
         'title' => $this->t('Set as default'),
-        'route_name' => 'search.set_default',
+        'route_name' => 'entity.search_page.set_default',
         'route_parameters' => array(
           'search_page' => $entity->id(),
         ),