@@ -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