From 8f747361f18893a139483810504e094f2b5d2f4d Mon Sep 17 00:00:00 2001 From: Adam Zammit Date: Tue, 23 Jul 2013 09:34:09 +1000 Subject: [PATCH] Make sure sample fields without restrictions still display --- contactdetails.php | 3 ++- respondent.php | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/contactdetails.php b/contactdetails.php index 538251c4..186af2ce 100644 --- a/contactdetails.php +++ b/contactdetails.php @@ -152,7 +152,8 @@ else FROM sample_var as s JOIN `case` as c on (c.case_id = '$case_id' and c.sample_id = s.sample_id) JOIN `sample` as sa ON (sa.sample_id = c.sample_id) - JOIN sample_import_var_restrict as sv ON (sv.var LIKE s.var AND sa.import_id = sv.sample_import_id AND sv.restrict = 0)"; + LEFT JOIN sample_import_var_restrict as sv ON (sv.var LIKE s.var AND sa.import_id = sv.sample_import_id) + WHERE (sv.restrict IS NULL OR sv.restrict = 0)"; $rs = $db->GetAll($sql); diff --git a/respondent.php b/respondent.php index 6b96c774..e50da384 100644 --- a/respondent.php +++ b/respondent.php @@ -158,7 +158,8 @@ else FROM sample_var as s JOIN `case` as c on (c.case_id = '$case_id' and c.sample_id = s.sample_id) JOIN `sample` as sa ON (sa.sample_id = c.sample_id) - JOIN sample_import_var_restrict as sv ON (sv.var LIKE s.var AND sa.import_id = sv.sample_import_id AND sv.restrict = 0)"; + LEFT JOIN sample_import_var_restrict as sv ON (sv.var LIKE s.var AND sa.import_id = sv.sample_import_id) + WHERE (sv.restrict IS NULL OR sv.restrict = 0)"; $rs = $db->GetAll($sql);