Skip to content

Commit a135312

Browse files
authored
Fix VirtualColumn when order_column is custom DQL
1 parent d57f977 commit a135312

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

Response/DatatableQueryBuilder.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@ public function __construct(array $requestParams, DatatableInterface $datatable)
208208
$this->accessor = PropertyAccess::createPropertyAccessor();
209209

210210
$this->columns = $datatable->getColumnBuilder()->getColumns();
211+
$this->columnNames = $datatable->getColumnBuilder()->getColumnNames();
211212

212213
$this->selectColumns = [];
213214
$this->searchColumns = [];
@@ -427,7 +428,9 @@ private function initColumnArrays()
427428
$orderColumn = $this->accessor->getValue($column, 'orderColumn');
428429
$orderParts = explode('.', $orderColumn);
429430
if (\count($orderParts) < 2) {
430-
$orderColumn = $this->entityShortName.'.'.$orderColumn;
431+
if (!isset($this->columnNames[$orderColumn]) || null == $this->accessor->getValue($this->columns[$this->columnNames[$orderColumn]], 'customDql')) {
432+
$orderColumn = $this->entityShortName.'.'.$orderColumn;
433+
}
431434
}
432435
$this->orderColumns[] = $orderColumn;
433436
} else {

0 commit comments

Comments
 (0)