[BUGFIX] sortings

Author: achimfritz

Classes/Hooks/Datahandler/CommandMapPostProcessingHook.php

@@ -27,9 +27,12 @@ class CommandMapPostProcessingHook
      */
     protected $containerFactory;
 
-    public function __construct(ContainerFactory $containerFactory)
+    protected ContainerService $containerService;
+
+    public function __construct(ContainerFactory $containerFactory, ContainerService $containerService)
     {
         $this->containerFactory = $containerFactory;
+        $this->containerService = $containerService;
     }
 
     public function processCmdmap_postProcess(string $command, string $table, $id, $value, DataHandler $dataHandler, $pasteUpdate, $pasteDatamap): void
@@ -54,6 +57,19 @@ protected function localizeOrCopyToLanguage(int $uid, int $language, string $com
             $last = $dataHandler->copyMappingArray['tt_content'][$uid] ?? null;
             if ($command === 'copyToLanguage') {
                 $containerId = $last;
+                $pos = $this->containerService->getAfterContainerElementTarget($container);
+                // move next record after last child
+                $cmd = ['tt_content' => [$last => [
+                    'move' => [
+                        'target' => $pos,
+                        'action' => 'paste',
+                        'update' => [],
+                    ]
+                ]]];
+                $localDataHandler = GeneralUtility::makeInstance(DataHandler::class);
+                $localDataHandler->enableLogging = $dataHandler->enableLogging;
+                $localDataHandler->start([], $cmd, $dataHandler->BE_USER);
+                $localDataHandler->process_cmdmap();
             } else {
                 $containerId = $container->getUid();
             }
@@ -132,6 +148,18 @@ protected function copyOrMoveChildren(int $origUid, int $newId, int $containerId
                 $localDataHandler->enableLogging = $dataHandler->enableLogging;
                 $localDataHandler->start([], $cmd, $dataHandler->BE_USER);
                 $localDataHandler->process_cmdmap();
+                if (!isset($origCmdMap['tt_content'][$origUid][$command]['update']['sys_language_uid'])) {
+                    continue;
+                }
+                if ($origCmdMap['tt_content'][$origUid][$command]['update']['sys_language_uid'] === $record['sys_language_uid']) {
+                    continue;
+                }
+                $target = -$record['uid'];
+                // copy case
+                $newId = $localDataHandler->copyMappingArray['tt_content'][$record['uid']] ?? null;
+                if ($newId !== null) {
+                    $target = -$newId;
+                }
             }
             (GeneralUtility::makeInstance(DatahandlerProcess::class))->endContainerProcess($origUid);
         } catch (Exception $e) {

Classes/Hooks/Datahandler/DatamapPreProcessFieldArrayHook.php

@@ -56,19 +56,14 @@ public function __construct(
 
     protected function newElementAfterContainer(array $incomingFieldArray): array
     {
+        if (isset($incomingFieldArray['sorting'])) {
+            return $incomingFieldArray;
+        }
         $record = $this->database->fetchOneRecord(-(int)$incomingFieldArray['pid']);
         if ($record === null) {
             // new elements in container have already correct target
             return $incomingFieldArray;
         }
-        if ((int)$record['uid'] === (int)($incomingFieldArray['tx_container_parent'] ?? 0)) {
-            return $incomingFieldArray;
-        }
-        if ((int)($incomingFieldArray['tx_container_parent'] ?? 0) > 0 &&
-            (GeneralUtility::makeInstance(DatahandlerProcess::class))->isContainerInProcess((int)$incomingFieldArray['tx_container_parent'])
-        ) {
-            return $incomingFieldArray;
-        }
         if (!$this->tcaRegistry->isContainerElement($record['CType'])) {
             return $incomingFieldArray;
         }