Merge pull request #6729 from getkirby/fix/page-rules-move-one-more-time

Fix `PageRules::move()` one more time

src/Cms/PageRules.php

@@ -372,7 +372,7 @@ public static function move(Page $page, Site|Page $parent): bool
 			$parent->blueprint()->sections(),
 			fn ($section) =>
 				$section->type() === 'pages' &&
-				$section->parent() === $parent
+				$section->parent()->is($parent)
 		);
 
 		// check if the parent has at least one pages section
@@ -385,17 +385,20 @@ public static function move(Page $page, Site|Page $parent): bool
 			]);
 		}
 
-		// go through all allowed blueprints and
-		// add the name to the allow list
+		// go through all allowed templates and
+		// add the name to the allowlist
 		foreach ($sections as $section) {
-			foreach ($section->blueprints() as $blueprint) {
-				$allowed[] = $blueprint['name'];
+			foreach ($section->templates() as $template) {
+				$allowed[] = $template;
 			}
 		}
 
 		// check if the template of this page is allowed as subpage type
 		// for the potential new parent
-		if (in_array($page->intendedTemplate()->name(), $allowed) === false) {
+		if (
+			$allowed !== [] &&
+			in_array($page->intendedTemplate()->name(), $allowed) === false
+		) {
 			throw new PermissionException([
 				'key'  => 'page.move.template',
 				'data' => [

tests/Cms/Pages/PageRulesTest.php

@@ -908,6 +908,7 @@ public function testMoveWithInvalidTemplate()
 						'related' => [
 							'type'      => 'pages',
 							'parent'    => 'site.find("parent-a")',
+							'create'    => 'album',
 							'templates' => ['article']
 						]
 					]
@@ -1000,6 +1001,7 @@ public function testMoveWithParentWithNoTemplateRestrictions()
 					[
 						'slug'     => 'parent-b',
 						'template' => 'photography',
+						'create'   => 'album'
 					]
 				]
 			],
@@ -1008,7 +1010,7 @@ public function testMoveWithParentWithNoTemplateRestrictions()
 				'pages/photography' => [
 					'sections' => [
 						'albums' => [
-							'type' => 'pages',
+							'type' => 'pages'
 						]
 					]
 				]