[BUGFIX] Use correct column order in override dialog 90/58390/2
authorAndreas Fernandez <a.fernandez@scripting-base.de>
Tue, 25 Sep 2018 16:27:46 +0000 (18:27 +0200)
committerFrank Naegler <frank.naegler@typo3.org>
Thu, 27 Sep 2018 15:32:37 +0000 (17:32 +0200)
Resolves: #86152
Releases: master, 8.7
Change-Id: I677c6d0405b833caf8a62f7f560b2e9b97679b36
Reviewed-on: https://review.typo3.org/58390
Tested-by: TYPO3com <no-reply@typo3.com>
Reviewed-by: Frank Naegler <frank.naegler@typo3.org>
Tested-by: Frank Naegler <frank.naegler@typo3.org>
typo3/sysext/backend/Resources/Public/JavaScript/DragUploader.js

index 42cef2d..d0c2f43 100644 (file)
@@ -328,12 +328,12 @@ define(['jquery',
             )
           ),
           $('<td />').html(
-            askForOverride[i].uploaded.name + ' (' + (DragUploader.fileSizeAsString(askForOverride[i].uploaded.size)) + ')' +
-            '<br>' + moment(askForOverride[i].uploaded.lastModified, 'x').format('YYYY-MM-DD HH:mm')
+            askForOverride[i].original.name + ' (' + (DragUploader.fileSizeAsString(askForOverride[i].original.size)) + ')' +
+            '<br>' + moment(askForOverride[i].original.mtime, 'x').format('YYYY-MM-DD HH:mm')
           ),
           $('<td />').html(
-            askForOverride[i].uploaded.name + ' (' + (DragUploader.fileSizeAsString(askForOverride[i].original.size)) + ')' +
-            '<br>' + moment(askForOverride[i].original.mtime, 'X').format('YYYY-MM-DD HH:mm')
+            askForOverride[i].uploaded.name + ' (' + (DragUploader.fileSizeAsString(askForOverride[i].uploaded.size)) + ')' +
+            '<br>' + moment(askForOverride[i].uploaded.lastModified, 'X').format('YYYY-MM-DD HH:mm')
           ),
           $('<td />').append(
             $('<select />', {class: 'form-control t3js-actions', 'data-override': i}).append(