Cavemanon/piratepoet
7
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix ordering by subscriber

Browse Source 
[MAILPOET-4660]
This commit is contained in:
Jan Lysý
2023-03-01 17:38:52 +01:00
committed by Aschepikov
parent 163578b9bc
commit d54e666eea
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mailpoet/lib/Newsletter/Sending/ScheduledTaskSubscribersListingRepository.php
View File

@ -94,9 +94,13 @@ class ScheduledTaskSubscribersListingRepository extends ListingRepository {
// ScheduledTaskSubscriber doesn't have id column so the default fallback value 'id' // ScheduledTaskSubscriber doesn't have id column so the default fallback value 'id'
// generated in MailPoet\Listing\Handler needs to be changed to something else // generated in MailPoet\Listing\Handler needs to be changed to something else
if ($sortBy === 'id') { if ($sortBy === 'id') {
$sortBy = 'subscriber'; $sortBy = 'sts.subscriber';
} elseif ($sortBy === 'subscriberId') { // Ordering by subscriberId is mapped to email for consistency with Subscriber listing
$sortBy = 's.email';
} else {
$sortBy = "sts.{$sortBy}";
} }
$queryBuilder->addOrderBy("sts.$sortBy", $sortOrder); $queryBuilder->addOrderBy($sortBy, $sortOrder);
} }
protected function applySearch(QueryBuilder $queryBuilder, string $search) { protected function applySearch(QueryBuilder $queryBuilder, string $search) {