Merge f063ca0 into 58e15a4

qiita_db/metadata_template/prep_template.py

@@ -793,6 +793,7 @@ def _get_node_info(workflow, node):
         def _get_predecessors(workflow, node):
             # recursive method to get predecessors of a given node
             pred = []
+
             for pnode in workflow.graph.predecessors(node):
                 pred = _get_predecessors(workflow, pnode)
                 cxns = {x[0]: x[2]
@@ -864,15 +865,17 @@ def _get_predecessors(workflow, node):
                 if wk_params['sample']:
                     df = ST(self.study_id).to_dataframe(samples=list(self))
                     for k, v in wk_params['sample'].items():
-                        if k not in df.columns or v not in df[k].unique():
+                        if k not in df.columns or (v != '*' and v not in
+                                                   df[k].unique()):
                             reqs_satisfied = False
                         else:
                             total_conditions_satisfied += 1
 
                 if wk_params['prep']:
                     df = self.to_dataframe()
                     for k, v in wk_params['prep'].items():
-                        if k not in df.columns or v not in df[k].unique():
+                        if k not in df.columns or (v != '*' and v not in
+                                                   df[k].unique()):
                             reqs_satisfied = False
                         else:
                             total_conditions_satisfied += 1

qiita_db/processing_job.py

@@ -1020,7 +1020,7 @@ def submit(self, parent_job_id=None, dependent_jobs_list=None):
         # names to know if it should be executed differently and the
         # plugin should let Qiita know that a specific command should be ran
         # as job array or not
-        cnames_to_skip = {'Calculate Cell Counts'}
+        cnames_to_skip = {'Calculate Cell Counts', 'Calculate RNA Copy Counts'}
         if 'ENVIRONMENT' in plugin_env_script and cname not in cnames_to_skip:
             # the job has to be in running state so the plugin can change its`
             # status

qiita_pet/handlers/study_handlers/prep_template.py

@@ -81,11 +81,12 @@ def get(self):
             res['creation_job_filename'] = fp['filename']
             res['creation_job_filename_body'] = fp['body']
             summary = None
-            if res['creation_job'].outputs:
-                summary = relpath(
+            if res['creation_job'].status == 'success':
+                if res['creation_job'].outputs:
                     # [0] is the id, [1] is the filepath
-                    res['creation_job'].outputs['output'].html_summary_fp[1],
-                    qiita_config.base_data_dir)
+                    _file = res['creation_job'].outputs[
+                        'output'].html_summary_fp[1]
+                    summary = relpath(_file, qiita_config.base_data_dir)
             res['creation_job_artifact_summary'] = summary
 
         self.render('study_ajax/prep_summary.html', **res)