Skip to content
Snippets Groups Projects
Commit 60964d5b authored by Georg Ringer's avatar Georg Ringer Committed by Benni Mack
Browse files

[TASK] Change sorting of records in recycler module

The deleted records should be sorted by the timestamp descending instead
of by the uid ascending because in most cases one of the recently
deleted records should be restored.

In addition, a comparison is fixed as a drive-by change to have
compatible types.

Resolves: #100252
Releases: main, 12.4
Change-Id: I67ce8134ea498782b476381716559e92f9867059
Reviewed-on: https://review.typo3.org/c/Packages/TYPO3.CMS/+/78211


Tested-by: default avatarBenni Mack <benni@typo3.org>
Tested-by: default avatarStefan Bürk <stefan@buerk.tech>
Reviewed-by: default avatarStefan Bürk <stefan@buerk.tech>
Tested-by: default avatarStefan Froemken <froemken@gmail.com>
Tested-by: default avatarcore-ci <typo3@b13.com>
Reviewed-by: default avatarStefan Froemken <froemken@gmail.com>
Reviewed-by: default avatarBenni Mack <benni@typo3.org>
parent e9131cd2
Branches
Tags
No related merge requests found
......@@ -223,19 +223,23 @@ class DeletedRecords
if ($maxResults) {
$queryBuilder->setMaxResults($maxResults);
}
$recordsToCheck = $queryBuilder->select('*')
$queryBuilder = $queryBuilder->select('*')
->from($table)
->andWhere(
$queryBuilder->expr()->eq(
$deletedField,
$queryBuilder->createNamedParameter(1, Connection::PARAM_INT)
)
)
->orderBy('uid')
->executeQuery()
->fetchAllAssociative();
if ($recordsToCheck !== false) {
);
if ($GLOBALS['TCA'][$table]['ctrl']['tstamp'] ?? false) {
$queryBuilder = $queryBuilder
->orderBy($GLOBALS['TCA'][$table]['ctrl']['tstamp'], 'desc')
->addOrderBy('uid');
} else {
$queryBuilder = $queryBuilder->orderBy('uid');
}
$recordsToCheck = $queryBuilder->executeQuery()->fetchAllAssociative();
if ($recordsToCheck !== []) {
$this->checkRecordAccess($table, $recordsToCheck);
}
}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment