diff --git a/core/modules/content_moderation/content_moderation.routing.yml b/core/modules/content_moderation/content_moderation.routing.yml index 1ecc3cc..ea71032 100644 --- a/core/modules/content_moderation/content_moderation.routing.yml +++ b/core/modules/content_moderation/content_moderation.routing.yml @@ -1,5 +1,5 @@ content_moderation.overview: - path: '/admin/structure/content-moderation' + path: '/admin/config/workflow/moderation' defaults: _controller: '\Drupal\system\Controller\SystemController::systemAdminMenuBlockPage' _title: 'Content moderation' @@ -8,7 +8,7 @@ content_moderation.overview: # ModerationState routing definition entity.moderation_state.collection: - path: '/admin/structure/content-moderation/states' + path: '/admin/config/workflow/moderation/states' defaults: _entity_list: 'moderation_state' _title: 'Moderation states' @@ -18,7 +18,7 @@ entity.moderation_state.collection: _admin_route: TRUE entity.moderation_state.add_form: - path: '/admin/structure/content-moderation/states/add' + path: '/admin/config/workflow/moderation/states/add' defaults: _entity_form: 'moderation_state.add' _title: 'Add Moderation state' @@ -28,7 +28,7 @@ entity.moderation_state.add_form: _admin_route: TRUE entity.moderation_state.edit_form: - path: '/admin/structure/content-moderation/states/{moderation_state}' + path: '/admin/config/workflow/moderation/states/{moderation_state}' defaults: _entity_form: 'moderation_state.edit' _title: 'Edit Moderation state' @@ -38,7 +38,7 @@ entity.moderation_state.edit_form: _admin_route: TRUE entity.moderation_state.delete_form: - path: '/admin/structure/content-moderation/states/{moderation_state}/delete' + path: '/admin/config/workflow/moderation/states/{moderation_state}/delete' defaults: _entity_form: 'moderation_state.delete' _title: 'Delete Moderation state' @@ -49,7 +49,7 @@ entity.moderation_state.delete_form: # ModerationStateTransition routing definition entity.moderation_state_transition.collection: - path: '/admin/structure/content-moderation/transitions' + path: '/admin/config/workflow/moderation/transitions' defaults: _entity_list: 'moderation_state_transition' _title: 'Moderation state transitions' @@ -59,7 +59,7 @@ entity.moderation_state_transition.collection: _admin_route: TRUE entity.moderation_state_transition.add_form: - path: '/admin/structure/content-moderation/transitions/add' + path: '/admin/config/workflow/moderation/transitions/add' defaults: _entity_form: 'moderation_state_transition.add' _title: 'Add Moderation state transition' @@ -69,7 +69,7 @@ entity.moderation_state_transition.add_form: _admin_route: TRUE entity.moderation_state_transition.edit_form: - path: '/admin/structure/content-moderation/transitions/{moderation_state_transition}' + path: '/admin/config/workflow/moderation/transitions/{moderation_state_transition}' defaults: _entity_form: 'moderation_state_transition.edit' _title: 'Edit Moderation state transition' @@ -79,7 +79,7 @@ entity.moderation_state_transition.edit_form: _admin_route: TRUE entity.moderation_state_transition.delete_form: - path: '/admin/structure/content-moderation/transitions/{moderation_state_transition}/delete' + path: '/admin/config/workflow/moderation/transitions/{moderation_state_transition}/delete' defaults: _entity_form: 'moderation_state_transition.delete' _title: 'Delete Moderation state transition' diff --git a/core/modules/content_moderation/src/Entity/ModerationState.php b/core/modules/content_moderation/src/Entity/ModerationState.php index a707a6d..e6268ad 100644 --- a/core/modules/content_moderation/src/Entity/ModerationState.php +++ b/core/modules/content_moderation/src/Entity/ModerationState.php @@ -27,9 +27,9 @@ * "uuid" = "uuid" * }, * links = { - * "edit-form" = "/admin/structure/content-moderation/states/{moderation_state}/edit", - * "delete-form" = "/admin/structure/content-moderation/states/{moderation_state}/delete", - * "collection" = "/admin/structure/content-moderation/states" + * "edit-form" = "/admin/config/workflow/moderation/states/{moderation_state}/edit", + * "delete-form" = "/admin/config/workflow/moderation/states/{moderation_state}/delete", + * "collection" = "/admin/config/workflow/moderation/states" * } * ) */ diff --git a/core/modules/content_moderation/src/Entity/ModerationStateTransition.php b/core/modules/content_moderation/src/Entity/ModerationStateTransition.php index 5599f34..41863f0 100644 --- a/core/modules/content_moderation/src/Entity/ModerationStateTransition.php +++ b/core/modules/content_moderation/src/Entity/ModerationStateTransition.php @@ -28,9 +28,9 @@ * "weight" = "weight" * }, * links = { - * "edit-form" = "/admin/structure/content-moderation/transitions/{moderation_state_transition}/edit", - * "delete-form" = "/admin/structure/content-moderation/transitions/{moderation_state_transition}/delete", - * "collection" = "/admin/structure/content-moderation/transitions" + * "edit-form" = "/admin/config/workflow/moderation/transitions/{moderation_state_transition}/edit", + * "delete-form" = "/admin/config/workflow/moderation/transitions/{moderation_state_transition}/delete", + * "collection" = "/admin/config/workflow/moderation/transitions" * } * ) */ diff --git a/core/modules/content_moderation/src/Tests/ModerationStateStatesTest.php b/core/modules/content_moderation/src/Tests/ModerationStateStatesTest.php index 94e7bca..6ec8d4e 100644 --- a/core/modules/content_moderation/src/Tests/ModerationStateStatesTest.php +++ b/core/modules/content_moderation/src/Tests/ModerationStateStatesTest.php @@ -14,11 +14,11 @@ class ModerationStateStatesTest extends ModerationStateTestBase { */ public function testAccess() { $paths = [ - 'admin/structure/content-moderation', - 'admin/structure/content-moderation/states', - 'admin/structure/content-moderation/states/add', - 'admin/structure/content-moderation/states/draft', - 'admin/structure/content-moderation/states/draft/delete', + 'admin/config/workflow/moderation', + 'admin/config/workflow/moderation/states', + 'admin/config/workflow/moderation/states/add', + 'admin/config/workflow/moderation/states/draft', + 'admin/config/workflow/moderation/states/draft/delete', ]; foreach ($paths as $path) { @@ -39,7 +39,7 @@ public function testAccess() { */ public function testStateAdministration() { $this->drupalLogin($this->adminUser); - $this->drupalGet('admin/structure/content-moderation'); + $this->drupalGet('admin/config/workflow/moderation'); $this->assertLink('Moderation states'); $this->assertLink('Moderation state transitions'); $this->clickLink('Moderation states'); @@ -53,7 +53,7 @@ public function testStateAdministration() { 'label' => 'Drafty', ], t('Save')); $this->assertText('Saved the Drafty Moderation state.'); - $this->drupalGet('admin/structure/content-moderation/states/draft'); + $this->drupalGet('admin/config/workflow/moderation/states/draft'); $this->assertFieldByName('label', 'Drafty'); $this->drupalPostForm(NULL, [ 'label' => 'Draft', @@ -65,7 +65,7 @@ public function testStateAdministration() { 'id' => 'expired', ], t('Save')); $this->assertText('Created the Expired Moderation state.'); - $this->drupalGet('admin/structure/content-moderation/states/expired'); + $this->drupalGet('admin/config/workflow/moderation/states/expired'); $this->clickLink('Delete'); $this->assertText('Are you sure you want to delete Expired?'); $this->drupalPostForm(NULL, [], t('Delete')); diff --git a/core/modules/content_moderation/src/Tests/ModerationStateTransitionsTest.php b/core/modules/content_moderation/src/Tests/ModerationStateTransitionsTest.php index 8d399a0..6a782f6 100644 --- a/core/modules/content_moderation/src/Tests/ModerationStateTransitionsTest.php +++ b/core/modules/content_moderation/src/Tests/ModerationStateTransitionsTest.php @@ -14,10 +14,10 @@ class ModerationStateTransitionsTest extends ModerationStateTestBase { */ public function testAccess() { $paths = [ - 'admin/structure/content-moderation/transitions', - 'admin/structure/content-moderation/transitions/add', - 'admin/structure/content-moderation/transitions/draft_needs_review', - 'admin/structure/content-moderation/transitions/draft_needs_review/delete', + 'admin/config/workflow/moderation/transitions', + 'admin/config/workflow/moderation/transitions/add', + 'admin/config/workflow/moderation/transitions/draft_needs_review', + 'admin/config/workflow/moderation/transitions/draft_needs_review/delete', ]; foreach ($paths as $path) { @@ -39,13 +39,13 @@ public function testAccess() { public function testTransitionAdministration() { $this->drupalLogin($this->adminUser); - $this->drupalGet('admin/structure/content-moderation'); + $this->drupalGet('admin/config/workflow/moderation'); $this->clickLink('Moderation state transitions'); $this->assertLink('Add Moderation state transition'); $this->assertText('Request Review'); // Edit the Draft » Needs review. - $this->drupalGet('admin/structure/content-moderation/transitions/draft_needs_review'); + $this->drupalGet('admin/config/workflow/moderation/transitions/draft_needs_review'); $this->assertFieldByName('label', 'Request Review'); $this->assertFieldByName('stateFrom', 'draft'); $this->assertFieldByName('stateTo', 'needs_review'); @@ -53,7 +53,7 @@ public function testTransitionAdministration() { 'label' => 'Draft to Needs review', ], t('Save')); $this->assertText('Saved the Draft to Needs review Moderation state transition.'); - $this->drupalGet('admin/structure/content-moderation/transitions/draft_needs_review'); + $this->drupalGet('admin/config/workflow/moderation/transitions/draft_needs_review'); $this->assertFieldByName('label', 'Draft to Needs review'); // Now set it back. $this->drupalPostForm(NULL, [ @@ -62,7 +62,7 @@ public function testTransitionAdministration() { $this->assertText('Saved the Request Review Moderation state transition.'); // Add a new state. - $this->drupalGet('admin/structure/content-moderation/states/add'); + $this->drupalGet('admin/config/workflow/moderation/states/add'); $this->drupalPostForm(NULL, [ 'label' => 'Expired', 'id' => 'expired', @@ -70,7 +70,7 @@ public function testTransitionAdministration() { $this->assertText('Created the Expired Moderation state.'); // Add a new transition. - $this->drupalGet('admin/structure/content-moderation/transitions'); + $this->drupalGet('admin/config/workflow/moderation/transitions'); $this->clickLink(t('Add Moderation state transition')); $this->drupalPostForm(NULL, [ 'label' => 'Published » Expired', @@ -81,7 +81,7 @@ public function testTransitionAdministration() { $this->assertText('Created the Published » Expired Moderation state transition.'); // Delete the new transition. - $this->drupalGet('admin/structure/content-moderation/transitions/published_expired'); + $this->drupalGet('admin/config/workflow/moderation/transitions/published_expired'); $this->clickLink('Delete'); $this->assertText('Are you sure you want to delete Published » Expired?'); $this->drupalPostForm(NULL, [], t('Delete'));