diff --git a/admin/quota.php b/admin/quota.php index 1846b08e..2a1c93f3 100755 --- a/admin/quota.php +++ b/admin/quota.php @@ -129,7 +129,8 @@ if ($questionnaire_id != false) $sql = "SELECT s.sample_import_id as value,s.description, CASE WHEN s.sample_import_id = '$sample_import_id' THEN 'selected=\'selected\'' ELSE '' END AS selected FROM sample_import as s, questionnaire_sample as q WHERE q.questionnaire_id = $questionnaire_id - AND q.sample_import_id = s.sample_import_id"; + AND q.sample_import_id = s.sample_import_id + AND s.enabled = 1"; $s = $db->GetAll($sql); if (!empty($s)){ diff --git a/admin/quotarow.php b/admin/quotarow.php index 43f310a4..a34172f1 100755 --- a/admin/quotarow.php +++ b/admin/quotarow.php @@ -305,7 +305,8 @@ if ($questionnaire_id != false) $sql = "SELECT s.sample_import_id as value,s.description, CASE WHEN s.sample_import_id = '$sample_import_id' THEN 'selected=\'selected\'' ELSE '' END AS selected FROM sample_import as s, questionnaire_sample as q WHERE q.questionnaire_id = $questionnaire_id - AND q.sample_import_id = s.sample_import_id"; + AND q.sample_import_id = s.sample_import_id + AND s.enabled = 1"; $s = $db->GetAll($sql); if (!empty($s)){ print "

   " . T_("Sample") . ": 

";