fixing sql and test

Author: antgonza

qiita_db/data.py

@@ -364,15 +364,18 @@ def delete(cls, raw_data_id, study_id):
                 "doesn't exist" % (raw_data_id, study_id))
 
         # check if there are any prep templates for this study
-        prep_template_count = conn_handler.execute_fetchone(
+        prep_template_exists = conn_handler.execute_fetchone(
             """
             SELECT EXISTS(
                 SELECT * FROM qiita.prep_template AS pt
-                    JOIN qiita.study_raw_data AS srd on
-                        pt.raw_data_id=srd.raw_data_id
-                WHERE srd.raw_data_id={0} AND srd.study_id={1})
+                    LEFT JOIN qiita.common_prep_info AS cpi ON
+                    (pt.prep_template_id=cpi.prep_template_id)
+                    LEFT JOIN qiita.required_sample_info AS rsi ON
+                    (cpi.sample_id=rsi.sample_id)
+                WHERE raw_data_id = {0} and study_id = {1}
+            )
             """.format(raw_data_id, study_id))[0]
-        if prep_template_count:
+        if prep_template_exists:
             raise QiitaDBError(
                 "Raw data %d has prep template(s) associated so it can't be "
                 "erased." % raw_data_id)

qiita_db/test/test_data.py

@@ -284,8 +284,8 @@ def test_delete(self):
             RawData.delete(3, 1)
 
         # the raw data is linked to a study that has not prep templates
-        Study(2).add_raw_data([RawData(3)])
-        RawData.delete(3, 2)
+        Study(2).add_raw_data([RawData(1)])
+        RawData.delete(1, 2)
 
         # delete raw data
         self.assertTrue(RawData.exists(2))

qiita_pet/templates/study_description.html

@@ -153,8 +153,8 @@
 }
 
 
-function delete_raw_data(raw_data_id) {
-  if (confirm("Are you sure you want to delete raw data " + raw_data_id + "?")) {
+function delete_raw_data(raw_data_filetype, raw_data_id) {
+  if (confirm('Are you sure you want to delete raw data: ' + raw_data_filetype + ' (ID: ' + raw_data_id + ')?')) {
     var form = $("<form>")
     .attr("action", window.location.href)
     .attr("method", "post")

qiita_pet/templates/study_description_templates/raw_data_tab.html

@@ -7,7 +7,7 @@
   {% for rd_id, rd_filetype, _ in available_raw_data %}
     <li><a href="#raw_data_info_{{rd_id}}" role="tab" data-toggle="tab">
       {{rd_filetype}} (ID: {{rd_id}})
-      <button class="close" title="Remove this raw data" type="button" onclick="delete_raw_data({{rd_id}})">&nbsp; ×</button> 
+      <button class="close" title="Remove this raw data" type="button" onclick="delete_raw_data('{{rd_filetype}}', {{rd_id}})">&nbsp; ×</button> 
     </a></li>
   {% end %}
   </ul>