Merge tag '2.3.22'

Hotfix release 2.3.22 Fix copy item in tree view - before we have a "move" instead of copy
contao-community-alliance · Sep 15, 2024 · d3a2b2a · d3a2b2a
2 parents 5f6e745 + f0d67cb
commit d3a2b2a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/src/Contao/View/Contao2BackendView/ButtonRenderer.php b/src/Contao/View/Contao2BackendView/ButtonRenderer.php
@@ -54,6 +54,7 @@
 use ContaoCommunityAlliance\DcGeneral\Exception\DcGeneralInvalidArgumentException;
 use ContaoCommunityAlliance\DcGeneral\InputProviderInterface;
 use ContaoCommunityAlliance\Translator\TranslatorInterface;
+use ContaoCommunityAlliance\UrlBuilder\UrlBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 
 use function array_filter;
@@ -232,7 +233,8 @@ private function renderButtonsFor(
         if ($this->hasPasteButtons()) {
             $urlAfter = $this->addToUrl(sprintf('act=paste&after=%s&', $modelId));
             $urlInto  = $this->addToUrl(sprintf('act=paste&into=%s&', $modelId));
-
+            $urlAfter = UrlBuilder::fromUrl($urlAfter)->unsetQueryParameter('source')->getUrl();
+            $urlInto  = UrlBuilder::fromUrl($urlInto)->unsetQueryParameter('source')->getUrl();
 
             $buttonEvent = new GetPasteButtonEvent($this->environment);
             $buttonEvent

diff --git a/src/Contao/View/Contao2BackendView/TreeView.php b/src/Contao/View/Contao2BackendView/TreeView.php
@@ -60,6 +60,7 @@
 use ContaoCommunityAlliance\DcGeneral\Panel\SortElementInterface;
 use ContaoCommunityAlliance\DcGeneral\SessionStorageInterface;
 use ContaoCommunityAlliance\Translator\TranslatorInterface;
+use ContaoCommunityAlliance\UrlBuilder\UrlBuilder;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
@@ -606,9 +607,11 @@ protected function viewTree($collection)
                 ContaoEvents::BACKEND_ADD_TO_URL
             );
 
+            $urlInto = UrlBuilder::fromUrl($urlEvent->getUrl())->unsetQueryParameter('source')->getUrl();
+
             $buttonEvent = new GetPasteRootButtonEvent($environment);
             $buttonEvent
-                ->setHref($urlEvent->getUrl())
+                ->setHref($urlInto)
                 ->setPasteDisabled(false);
 
             $dispatcher->dispatch($buttonEvent, $buttonEvent::NAME);