Merge pull request #686 from antgonza/prep-sample-template-download-permissions

fixing small issue in the prep templates download permissions

Author: ElDeveloper

qiita_db/meta_util.py

@@ -28,6 +28,7 @@
 from .study import Study
 from .data import RawData, PreprocessedData, ProcessedData
 from .analysis import Analysis
+from .metadata_template import PrepTemplate, SampleTemplate
 
 
 def _get_data_fpids(constructor, object_id):
@@ -84,6 +85,18 @@ def get_accessible_filepath_ids(user_id):
             for data_id in data_ids:
                 filepath_ids.update(_get_data_fpids(constructor, data_id))
 
+        # adding prep and sample templates
+        prep_fp_ids = []
+        for rdid in study.raw_data():
+            for pt_id in RawData(rdid).prep_templates:
+                for _id, _ in PrepTemplate(pt_id).get_filepaths():
+                    prep_fp_ids.append(_id)
+
+        filepath_ids.update(prep_fp_ids)
+        sample_fp_ids = [_id for _id, _
+                         in SampleTemplate(study_id).get_filepaths()]
+        filepath_ids.update(sample_fp_ids)
+
     # Next, analyses
     # Same as before, ther eare public, private, and shared
     analysis_ids = Analysis.get_by_status('public') + user.private_analyses + \

qiita_db/test/test_meta_util.py

@@ -28,7 +28,7 @@ def test_get_accessible_filepath_ids(self):
 
         # shared has access to all study files and analysis files
         obs = get_accessible_filepath_ids('[email protected]')
-        self.assertEqual(obs, set([1, 2, 3, 4, 5, 6, 7, 11, 14, 15]))
+        self.assertEqual(obs, set([1, 2, 3, 4, 5, 6, 7, 11, 14, 15, 16]))
 
         # Now shared should not have access to the study files
         self._unshare_studies()