Merge pull request #728 from isb-cgc/isb-cgc-prod-sp

Hotfix for multiple user whitelist access in IGV

cohorts/file_helpers.py

@@ -291,7 +291,7 @@ def cohort_files(cohort_id, inc_filters=None, user=None, limit=25, page=1, offse
                         whitelist_found = False
                         # If this is a controlled-access entry, check for the user's access to it
                         if item['access'] == 'controlled' and access:
-                            whitelists = item['acl'].split(',')
+                            whitelists = item['acl'].split(';')
                             for whitelist in whitelists:
                                 if whitelist in access:
                                     whitelist_found = True

cohorts/views.py

@@ -2185,6 +2185,7 @@ def export_data(request, cohort_id=0, export_type=None, export_sub_type=None):
         # Some files only have case barcodes, but some have sample barcodes. We have to make sure
         # to export any files linked to a case if any sample from that case is in the cohort, but
         # if files are linked to a sample, we only export them if the specific sample is in the cohort.
+
         if export_type == 'file_manifest':
             query_string_base = """
                  SELECT md.sample_barcode, md.case_barcode, md.file_name_key as cloud_storage_location,