Dev: fix survey pagination

LimeSurvey · Feb 7, 2024 · aded0fe · aded0fe
1 parent 650bad5
commit aded0fe
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -1525,9 +1525,18 @@ public function search($options = [])
         if (method_exists(Yii::app()->cache, 'flush')) {
             Yii::app()->cache->flush();
         }
-        $pageSizeUser = Yii::app()->user->getState('pageSize', Yii::app()->params['defaultPageSize']);
-        $pageSize = $options['pageSize'] ?? $pageSizeUser;
-        $currentPage = $options['currentPage'] ?? null;
+        $pagination = [
+            'pageSize' => Yii::app()->user->getState(
+                'pageSize',
+                Yii::app()->params['defaultPageSize']
+            )
+        ];
+        if (isset($options['pageSize'])) {
+            $pagination['pageSize'] = $options['pageSize'];
+        }
+        if (isset($options['currentPage'])) {
+            $pagination['currentPage'] = $options['currentPage'];
+        }
 
         $sort = new CSort();
         $sort->attributes = array(
@@ -1653,10 +1662,7 @@ public function search($options = [])
         $dataProvider = new CActiveDataProvider('Survey', array(
             'sort' => $sort,
             'criteria' => $criteria,
-            'pagination' => array(
-                'pageSize' => $pageSize,
-                'currentPage' => $currentPage
-            ),
+            'pagination' => $pagination,
         ));
 
         $dataProvider->setTotalItemCount($this->count($criteria));