From f350d10f1836b6f6017c97acd665b01c6fc1822c Mon Sep 17 00:00:00 2001 From: Menno Dekker Date: Tue, 9 Jun 2009 07:35:50 +0000 Subject: [PATCH] Dev: Fixed problems caused by changed behaviour of incompleteAnsFilterstate() git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@7045 b72ed6b6-b9f8-46b5-92b4-906544132732 --- admin/listcolumn.php | 11 ++++++++++- config-defaults.php | 9 ++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/admin/listcolumn.php b/admin/listcolumn.php index 23bfba91084..1180f79f200 100644 --- a/admin/listcolumn.php +++ b/admin/listcolumn.php @@ -44,7 +44,16 @@ $query .= " AND ".auto_unescape(urldecode($sql)); } -if (incompleteAnsFilterstate() === true) {$query .= " AND submitdate is not null";} +switch (incompleteAnsFilterstate()) { + case 'inc': + //Inclomplete answers only + $query .= ' WHERE submitdate is null '; + break; + case 'filter': + //Inclomplete answers only + $query .= ' WHERE submitdate is not null '; + break; + } if ($order == "alpha") { diff --git a/config-defaults.php b/config-defaults.php index 0ac2b35e28c..e2f691d2332 100644 --- a/config-defaults.php +++ b/config-defaults.php @@ -157,9 +157,12 @@ // // $filterout_incomplete_answers // * default behaviour of LimeS regarding answer records with no submitdate -// * can be overwritten by module parameters -// ('Filter-Out incomplete answers' checkbox when implemented) -$filterout_incomplete_answers = true; +// * can be overwritten by module parameters choose one of the following:// +// * filter: Show only complete answers +// * show: Show both complete and incomplete answers +// * incomplete: Show only incomplete answers + +$filterout_incomplete_answers = 'show'; // // $stripQueryFromRefurl (default is false) // * default behaviour is to record the full referer url when requested