2
0
mirror of https://github.com/ACSPRI/queXS synced 2024-04-02 12:12:16 +00:00

Make sure sample fields without restrictions still display

This commit is contained in:
Adam Zammit
2013-07-23 09:34:09 +10:00
parent 7e63cae7a7
commit 8f747361f1
2 changed files with 4 additions and 2 deletions

View File

@@ -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);

View File

@@ -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);