Merge pull request #980 from mailpoet/newsletter_listing_update

Sorts standard/history notification records by sent_at date in listings [MAILPOET-932]
This commit is contained in:
Tautvidas Sipavičius
2017-07-11 12:43:06 +03:00
committed by GitHub
12 changed files with 216 additions and 56 deletions

View File

@@ -772,15 +772,22 @@ class Newsletter extends Model {
}
static function listingQuery($data = array()) {
return self::select(array(
$query = self::select(
array(
'id',
'subject',
'hash',
'type',
'status',
'sent_at',
'updated_at',
'deleted_at'
))
)
);
if($data['sort_by'] === 'sent_at') {
$query = $query->orderByExpr('ISNULL(sent_at) DESC');
}
return $query
->filter('filterBy', $data)
->filter('groupBy', $data)
->filter('search', $data['search']);