diff --git a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php index 9a4680c..07db5b5 100644 --- a/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php +++ b/core/modules/block/lib/Drupal/block/Tests/Views/DisplayBlockTest.php @@ -230,7 +230,7 @@ public function testBlockContextualLinks() { $block = $this->drupalPlaceBlock('views_block:test_view_block-block_1'); $this->drupalGet('test-page'); - $id = 'block:block=' . $block->id() . ':|views_ui_edit:view=test_view_block:location=block&name=test_view_block&display_id=block_1'; + $id = 'block:block=' . $block->id() . ':|view:view=test_view_block:location=block&name=test_view_block&display_id=block_1'; // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:assertContextualLinkPlaceHolder() $this->assertRaw('
', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id))); diff --git a/core/modules/contextual/contextual.module b/core/modules/contextual/contextual.module index e405f20..89685e0 100644 --- a/core/modules/contextual/contextual.module +++ b/core/modules/contextual/contextual.module @@ -317,7 +317,7 @@ function contextual_contextual_links_view_alter(&$element, $items) { * * Examples: * - node:node=1: - * - views_ui_edit:view=frontpage:location=page&view_name=frontpage&view_display_id=page_1 + * - view:view=frontpage:location=page&view_name=frontpage&view_display_id=page_1 * - menu:menu=tools:|block:block=bartik.tools: * * So, expressed in a pattern: diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php index 4cbbca3..18c7d99 100644 --- a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php +++ b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualDynamicContextTest.php @@ -63,7 +63,7 @@ function testDifferentPermissions() { 'node:node=' . $node1->id() . ':', 'node:node=' . $node2->id() . ':', 'node:node=' . $node3->id() . ':', - 'views_ui_edit:view=frontpage:location=page&name=frontpage&display_id=page_1', + 'view:view=frontpage:location=page&name=frontpage&display_id=page_1', ); // Editor user: can access contextual links and can edit articles. diff --git a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php index 738f047..f773262 100644 --- a/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php +++ b/core/modules/contextual/lib/Drupal/contextual/Tests/ContextualUnitTest.php @@ -65,7 +65,7 @@ function _contextual_links_id_testcases() { // - metadata. $tests[] = array( 'links' => array( - 'views_ui_edit' => array( + 'view' => array( 'route_parameters' => array( 'view' => 'frontpage' ), @@ -75,7 +75,7 @@ function _contextual_links_id_testcases() { ), ), ), - 'id' => 'views_ui_edit:view=frontpage:location=page&display=page_1', + 'id' => 'view:view=frontpage:location=page&display=page_1', ); // Test branch conditions: diff --git a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php index 905095a..6552e29 100644 --- a/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php +++ b/core/modules/views_ui/lib/Drupal/views_ui/Tests/DisplayTest.php @@ -225,7 +225,7 @@ public function testDisplayPluginsAlter() { // Test the expected views_ui array exists on each definition. foreach ($definitions as $definition) { - $this->assertIdentical($definition['contextual links']['views_ui_edit'], $expected, 'Expected views_ui array found in plugin definition.'); + $this->assertIdentical($definition['contextual links']['view'], $expected, 'Expected views_ui array found in plugin definition.'); } } @@ -288,7 +288,7 @@ public function testPageContextualLinks() { $view->enable()->save(); $this->drupalGet('test-display'); - $id = 'views_ui_edit:view=test_display:location=page&name=test_display&display_id=page_1'; + $id = 'view:view=test_display:location=page&name=test_display&display_id=page_1'; // @see \Drupal\contextual\Tests\ContextualDynamicContextTest:assertContextualLinkPlaceHolder() $this->assertRaw('
', format_string('Contextual link placeholder with id @id exists.', array('@id' => $id))); diff --git a/core/modules/views_ui/views_ui.contextual_links.yml b/core/modules/views_ui/views_ui.contextual_links.yml index 20e9ead..d77012a 100644 --- a/core/modules/views_ui/views_ui.contextual_links.yml +++ b/core/modules/views_ui/views_ui.contextual_links.yml @@ -1,7 +1,7 @@ views_ui.edit: title: 'Edit view' route_name: views_ui.edit - group: views_ui_edit + group: view views_ui.preview: title: 'Preview view' diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module index 850f8cf..7b38134 100644 --- a/core/modules/views_ui/views_ui.module +++ b/core/modules/views_ui/views_ui.module @@ -272,7 +272,7 @@ function views_ui_views_plugins_display_alter(&$plugins) { // paths underneath "admin/structure/views/view/{$view->id()}" (i.e., paths // for editing and performing other contextual actions on the view). foreach ($plugins as &$display) { - $display['contextual links']['views_ui_edit'] = array( + $display['contextual links']['view'] = array( 'route_name' => 'views_ui.edit', 'route_parameters_names' => array('view' => 'id'), );