diff --git a/src/Entity/HelpTopic.php b/src/Entity/HelpTopic.php index 73c3755..919c7fb 100644 --- a/src/Entity/HelpTopic.php +++ b/src/Entity/HelpTopic.php @@ -69,10 +69,10 @@ use Drupal\config_help\TextSectionPluginCollection; * "canonical" = "/admin/help-topic/{help_topic}", * "collection" = "/admin/config/development/help", * "add-form" = "/admin/config/development/help/add", - * "edit-form" = "/admin/config/development/help/{help_topic}", - * "delete-form" = "/admin/config/development/help/{help_topic}/delete", - * "lock-form" = "/admin/config/development/help/{help_topic}/lock", - * "unlock-form" = "/admin/config/development/help/{help_topic}/unlock", + * "edit-form" = "/admin/config/development/help/manage/{help_topic}", + * "delete-form" = "/admin/config/development/help/manage/{help_topic}/delete", + * "lock-form" = "/admin/config/development/help/manage/{help_topic}/lock", + * "unlock-form" = "/admin/config/development/help/manage/{help_topic}/unlock", * } * ) */ diff --git a/src/HelpTopicRouteProvider.php b/src/HelpTopicRouteProvider.php index 9515fac..946f127 100644 --- a/src/HelpTopicRouteProvider.php +++ b/src/HelpTopicRouteProvider.php @@ -17,7 +17,7 @@ class HelpTopicRouteProvider extends DefaultHtmlRouteProvider { public function getRoutes(EntityTypeInterface $entity_type) { $collection = parent::getRoutes($entity_type); - $route = (new Route('/admin/config/development/help/{help_topic}/unlock')) + $route = (new Route('/admin/config/development/help/manage/{help_topic}/unlock')) ->setDefaults([ '_entity_form' => 'help_topic.unlock', '_title' => 'Unlock help topic', @@ -25,7 +25,7 @@ class HelpTopicRouteProvider extends DefaultHtmlRouteProvider { ->setRequirement('_entity_access', 'help_topic.unlock'); $collection->add('entity.help_topic.unlock_form', $route); - $route = (new Route('/admin/config/development/help/{help_topic}/lock')) + $route = (new Route('/admin/config/development/help/manage/{help_topic}/lock')) ->setDefaults([ '_entity_form' => 'help_topic.lock', '_title' => 'Lock help topic', diff --git a/tests/src/Functional/HelpTopicAdminTest.php b/tests/src/Functional/HelpTopicAdminTest.php index 739dfc0..0227fb7 100644 --- a/tests/src/Functional/HelpTopicAdminTest.php +++ b/tests/src/Functional/HelpTopicAdminTest.php @@ -107,10 +107,10 @@ class HelpTopicAdminTest extends BrowserTestBase { // any topic, and that a user with the permission can get to the forms, // but only to lock an unlocked topic and vice versa. $pages = [ - 'admin/config/development/help/help_test/lock' => TRUE, - 'admin/config/development/help/help_test_locked/lock' => FALSE, - 'admin/config/development/help/help_test/unlock' => FALSE, - 'admin/config/development/help/help_test_locked/unlock' => TRUE, + 'admin/config/development/help/manage/help_test/lock' => TRUE, + 'admin/config/development/help/manage/help_test_locked/lock' => FALSE, + 'admin/config/development/help/manage/help_test/unlock' => FALSE, + 'admin/config/development/help/manage/help_test_locked/unlock' => TRUE, ]; foreach ($pages as $page => $allowed) { $this->drupalGet($page); @@ -132,14 +132,14 @@ class HelpTopicAdminTest extends BrowserTestBase { // deleting of unlocked pages is tested elsewhere. Note that the URL // for editing has no suffix. foreach (['', '/delete'] as $action) { - $this->drupalGet('admin/config/development/help/help_test_locked' . $action); + $this->drupalGet('admin/config/development/help/manage/help_test_locked' . $action); $session = $this->assertSession(); $session->statusCodeEquals(403); } // Unlock the page, and verify it can then be edited/deleted, but not // unlocked. - $this->drupalGet('admin/config/development/help/help_test_locked/unlock'); + $this->drupalGet('admin/config/development/help/manage/help_test_locked/unlock'); $session = $this->assertSession(); $session->pageTextContains('Locked topics are typically provided by modules'); $session->pageTextContains('Are you sure you want to unlock the topic'); @@ -149,16 +149,16 @@ class HelpTopicAdminTest extends BrowserTestBase { $session->pageTextContains('Unlocked help topic'); // The '' action is actually edit. foreach (['', '/delete', '/lock'] as $action) { - $this->drupalGet('admin/config/development/help/help_test_locked' . $action); + $this->drupalGet('admin/config/development/help/manage/help_test_locked' . $action); $session = $this->assertSession(); $session->statusCodeEquals(200); } - $this->drupalGet('admin/config/development/help/help_test_locked/unlock'); + $this->drupalGet('admin/config/development/help/manage/help_test_locked/unlock'); $session = $this->assertSession(); $session->statusCodeEquals(403); // Lock it up again, and verify again. - $this->drupalGet('admin/config/development/help/help_test_locked/lock'); + $this->drupalGet('admin/config/development/help/manage/help_test_locked/lock'); $session = $this->assertSession(); $session->pageTextContains('Locked topics cannot be edited or deleted until they are unlocked'); $session->pageTextContains('Are you sure you want to lock the topic'); @@ -168,11 +168,11 @@ class HelpTopicAdminTest extends BrowserTestBase { $session->pageTextContains('Locked help topic'); // The '' action is actually edit. foreach (['', '/delete', '/lock'] as $action) { - $this->drupalGet('admin/config/development/help/help_test_locked' . $action); + $this->drupalGet('admin/config/development/help/manage/help_test_locked' . $action); $session = $this->assertSession(); $session->statusCodeEquals(403); } - $this->drupalGet('admin/config/development/help/help_test_locked/unlock'); + $this->drupalGet('admin/config/development/help/manage/help_test_locked/unlock'); $session = $this->assertSession(); $session->statusCodeEquals(200); } @@ -288,7 +288,7 @@ class HelpTopicAdminTest extends BrowserTestBase { $session->linkExists($new_title); // Test deleting. - $this->drupalGet('admin/config/development/help/' . $new_id . '/delete'); + $this->drupalGet('admin/config/development/help/manage/' . $new_id . '/delete'); $session = $this->assertSession(); $session->pageTextContains('This action cannot be undone.'); $session->pageTextContains('Are you sure you want to delete the help topic'); diff --git a/tests/src/Functional/HelpTopicTranslateTest.php b/tests/src/Functional/HelpTopicTranslateTest.php index 458fc59..a810120 100644 --- a/tests/src/Functional/HelpTopicTranslateTest.php +++ b/tests/src/Functional/HelpTopicTranslateTest.php @@ -71,7 +71,7 @@ class HelpTopicTranslateTest extends BrowserTestBase { // Translate a topic. $es_body = 'This is the fake Spanish body'; $es_title = 'This is the fake Spanish title'; - $this->drupalGet('admin/config/development/help/help_test/translate'); + $this->drupalGet('admin/config/development/help/manage/help_test/translate'); $this->clickLink('Add'); $this->drupalPostForm(NULL, [ 'translation[config_names][config_help.topic.help_test][label]' => $es_title, @@ -109,7 +109,7 @@ class HelpTopicTranslateTest extends BrowserTestBase { ], 'Save'); // Translate it into English. - $this->drupalGet('admin/config/development/help/foo/translate'); + $this->drupalGet('admin/config/development/help/manage/foo/translate'); $this->clickLink('Add'); $this->drupalPostForm(NULL, [ 'translation[config_names][config_help.topic.foo][label]' => $second_en_title,