Skip to content

Commit

Permalink
Fixed issue #09757: Inclusion filter for full responses/Incomplete re…
Browse files Browse the repository at this point in the history
…sponses can not be reset in browse

Dev: remove inclusion
  • Loading branch information
Shnoulle committed Jul 7, 2015
1 parent efac566 commit 1e24ad2
Showing 1 changed file with 1 addition and 10 deletions.
11 changes: 1 addition & 10 deletions application/controllers/admin/responses.php
Expand Up @@ -410,7 +410,6 @@ function browse($iSurveyId)
"N"=>gt("No"),
),
),

'sortable'=>true,
'hidden'=>$bHidden,
'width'=>'100',
Expand Down Expand Up @@ -626,14 +625,6 @@ public function getResponses_json($iSurveyID)
$aSpecificColumns=array_merge($aSpecificColumns,TokenDynamic::model($iSurveyID)->getTableSchema()->getColumnNames());
}

if (incompleteAnsFilterState() == "incomplete")
{
$oCriteria->addCondition("submitdate IS NULL");
}
elseif (incompleteAnsFilterState() == "complete")
{
$oCriteria->addCondition("submitdate IS NOT NULL");
}
//Get the filter data
//if (Yii::app()->request->getPost('sql') && stripcslashes(Yii::app()->request->getPost('sql')) !== "" && Yii::app()->request->getPost('sql') != "NULL")
// $oCriteria->addCondition(stripcslashes(Yii::app()->request->getPost('sql')));
Expand All @@ -660,7 +651,7 @@ public function getResponses_json($iSurveyID)
$oCriteria->order = "{$sOrderBy} {$sOrder}";
if(Yii::app()->request->getParam('_search'))
{
if(($value=Yii::app()->request->getParam('completed')) && !incompleteAnsFilterState()) //
if(($value=Yii::app()->request->getParam('completed')))
{
if($value=='Y')
$oCriteria->addCondition("submitdate IS NOT NULL");
Expand Down

0 comments on commit 1e24ad2

Please sign in to comment.