From ef83d059895bc1b8f5e06a828bb9d1c2fc4bc52a Mon Sep 17 00:00:00 2001 From: LouisGac Date: Mon, 11 Nov 2019 18:06:24 +0100 Subject: [PATCH] Fixed issue #15523: View saved but not submitted - filters do not work --- application/controllers/admin/saved.php | 9 +++++++++ application/views/admin/saved/savedlist_view.php | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/application/controllers/admin/saved.php b/application/controllers/admin/saved.php index 0aa61c8beac..79b487968c1 100644 --- a/application/controllers/admin/saved.php +++ b/application/controllers/admin/saved.php @@ -42,6 +42,15 @@ public function view($iSurveyId) $aThisSurvey = getSurveyInfo($iSurveyId); $oSavedControlModel = SavedControl::model(); $oSavedControlModel->sid = $iSurveyId; + + // Filter state + if (Yii::app()->request->getParam('SavedControl',false)){ + $aFilters = Yii::app()->request->getParam('SavedControl'); + foreach($aFilters as $sFilterName => $sFilterValue){ + $oSavedControlModel->$sFilterName = $sFilterValue; + } + } + $aData['model'] = $oSavedControlModel; $aData['sSurveyName'] = $aThisSurvey['name']; $aData['iSurveyId'] = $iSurveyId; diff --git a/application/views/admin/saved/savedlist_view.php b/application/views/admin/saved/savedlist_view.php index 47e15b9159c..d2cf36d2c16 100644 --- a/application/views/admin/saved/savedlist_view.php +++ b/application/views/admin/saved/savedlist_view.php @@ -13,7 +13,7 @@ 'dataProvider' => $model->search(), 'columns' => $model->columns, 'filter' => $model, - 'ajaxType' => 'POST', + 'ajaxType' => 'GET', 'template' => "{items}\n
{pager}
{summary}
", 'emptyText'=>gT('No customizable entries found.'), 'summaryText'=>gT('Displaying {start}-{end} of {count} result(s).').' '. sprintf(gT('%s rows per page'),