Skip to content

Commit 9665976

Browse files
authored
Merge pull request #24 from Setitch/patch-3
Update DataTableAction.php
2 parents 7a9d315 + ce2a600 commit 9665976

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

src/DataTableAction.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,14 +64,13 @@ public function run()
6464
if (!empty($originalQuery->where)) {
6565
$filterQuery->andWhere($originalQuery->where);
6666
}
67-
$actionQuery = clone $filterQuery;
6867
$filterQuery
6968
->offset(Yii::$app->request->getQueryParam('start', 0))
7069
->limit(Yii::$app->request->getQueryParam('length', -1));
7170
/* Begin of fix - serverSide pagination - get pagination from server side - Yii
7271
$dataProvider = new ActiveDataProvider(['query' => $filterQuery, 'pagination' => false]);
7372
*/
74-
$dataProvider = new ActiveDataProvider(['query' => $actionQuery, 'pagination' => ['pageSize' => Yii::$app->request->getQueryParam('length', 10)] ]);
73+
$dataProvider = new ActiveDataProvider(['query' => $filterQuery, 'pagination' => ['pageSize' => Yii::$app->request->getQueryParam('length', 10)] ]);
7574
// End of fix - serverSide pagination - get pagination from server side - Yii
7675
Yii::$app->response->format = \yii\web\Response::FORMAT_JSON;
7776
try {
@@ -82,7 +81,7 @@ public function run()
8281
/* Begin of fix - get actual data from server according to filters, offset and limit
8382
'data' => $dataProvider->getModels(),
8483
*/
85-
'data' => $actionQuery->all(),
84+
'data' => $filterQuery->all(),
8685
// End of fix - get actual data from server according to filters, offset and limit
8786
];
8887
} catch (\Exception $e) {

0 commit comments

Comments
 (0)