From 1f3f32deb17958330886acdc09a781519f5b648f Mon Sep 17 00:00:00 2001 From: pKallert Date: Fri, 7 Feb 2025 14:00:42 +0100 Subject: [PATCH 1/2] Fix: Rebase onto 8.3 --- Classes/Domain/Model/Changes/AbstractCopy.php | 1 + Classes/Domain/Model/Changes/AbstractMove.php | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Classes/Domain/Model/Changes/AbstractCopy.php b/Classes/Domain/Model/Changes/AbstractCopy.php index fa5b32cc84..f0af90a1f7 100644 --- a/Classes/Domain/Model/Changes/AbstractCopy.php +++ b/Classes/Domain/Model/Changes/AbstractCopy.php @@ -36,6 +36,7 @@ protected function finish(NodeInterface $node): void $updateNodeInfo->setNode($node); $updateNodeInfo->recursive(); $this->feedbackCollection->add($updateNodeInfo); + $this->addNodeCreatedFeedback($this->getSubject()); parent::finish($node); } diff --git a/Classes/Domain/Model/Changes/AbstractMove.php b/Classes/Domain/Model/Changes/AbstractMove.php index a872f9ab42..f7dc24536e 100644 --- a/Classes/Domain/Model/Changes/AbstractMove.php +++ b/Classes/Domain/Model/Changes/AbstractMove.php @@ -17,6 +17,7 @@ use Neos\Neos\Ui\Domain\Model\Feedback\Operations\RemoveNode; use Neos\Flow\Annotations as Flow; use Neos\Neos\Ui\Domain\Model\Feedback\Operations\UpdateNodePath; +use Neos\Neos\Ui\Domain\Model\Feedback\Operations\Redirect; abstract class AbstractMove extends AbstractStructuralChange { @@ -40,7 +41,11 @@ protected function finish(NodeInterface $node) $updateNodePath->setNewContextPath($this->getSubject()->getContextPath()); $this->feedbackCollection->add($updateNodePath); } - + if ($this->getSubject()->getNodeType()->isOfType('Neos.Neos:Document')) { + $redirect = new Redirect(); + $redirect->setNode($this->getSubject()); + $this->feedbackCollection->add($redirect); + } // $this->getSubject() is the moved node at the NEW location! parent::finish($this->getSubject()); } From 43236004bd00236048cecfdd9239a0fe1bf5d0f1 Mon Sep 17 00:00:00 2001 From: pKallert <91674611+pKallert@users.noreply.github.com> Date: Thu, 27 Mar 2025 09:46:23 +0100 Subject: [PATCH 2/2] Fix: Copy to right node Co-authored-by: Marc Henry Schultz <85400359+mhsdesign@users.noreply.github.com> --- Classes/Domain/Model/Changes/AbstractCopy.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Classes/Domain/Model/Changes/AbstractCopy.php b/Classes/Domain/Model/Changes/AbstractCopy.php index f0af90a1f7..9c9d32524a 100644 --- a/Classes/Domain/Model/Changes/AbstractCopy.php +++ b/Classes/Domain/Model/Changes/AbstractCopy.php @@ -36,7 +36,7 @@ protected function finish(NodeInterface $node): void $updateNodeInfo->setNode($node); $updateNodeInfo->recursive(); $this->feedbackCollection->add($updateNodeInfo); - $this->addNodeCreatedFeedback($this->getSubject()); + $this->addNodeCreatedFeedback($node); parent::finish($node); }