fix SelectedSamplesHandler.get

qiita-spots · Jul 1, 2022 · 2ed031e · 2ed031e
1 parent 0022064
commit 2ed031e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 16 deletions.
diff --git a/qiita_db/software.py b/qiita_db/software.py
@@ -51,9 +51,9 @@ class Command(qdb.base.QiitaObject):
     -------------
     create
     exists
-    get_commands_by_input_type(cls, artifact_types, active_only=True,
-    get_html_generator(cls, artifact_type):
-    get_validator(cls, artifact_type):
+    get_commands_by_input_type
+    get_html_generator
+    get_validator
 
     See Also
     --------

diff --git a/qiita_pet/handlers/analysis_handlers/listing_handlers.py b/qiita_pet/handlers/analysis_handlers/listing_handlers.py
@@ -118,13 +118,15 @@ def get(self):
 
         # finding common metadata fields
         metadata = analysis.metadata_categories
-        common = []
+        common = {'sample': set(), 'prep': set()}
         for i, (_, m) in enumerate(metadata.items()):
-            if i == 0:
-                common = {'sample': set(m['sample']), 'prep': set(m['prep'])}
-            else:
-                common['sample'] = common['sample'] & set(m['sample'])
-                common['prep'] = common['prep'] & set(m['prep'])
+            svals = set(m['sample'])
+            pvals = set(m['prep'])
+            if i != 0:
+                svals = common['sample'] & svals
+                pvals = common['prep'] & pvals
+            common['sample'] = svals
+            common['prep'] = pvals
 
         self.render("analysis_selected.html", sel_data=sel_data,
                     proc_info=proc_data_info, metadata=metadata, common=common)
diff --git a/qiita_pet/templates/analysis_selected.html b/qiita_pet/templates/analysis_selected.html
@@ -63,13 +63,8 @@
       $('#clear-button').on('click', clear);
       {% if sel_data %}$('#no-selected').hide(){% end %}
 
-      {% if 'common' in locals() %}
-        var common_sample_fields = {% raw list(common['sample']) %};
-        var common_prep_fields = {% raw list(common['prep']) %};
-      {% else %}
-        var common_sample_fields = [];
-        var common_prep_fields = [];
-      {% end %}
+      var common_sample_fields = {% raw list(common['sample']) %};
+      var common_prep_fields = {% raw list(common['prep']) %};
 
       $.each($(".chosen-select"), function (_, element){
         var is_sample = element.id.startsWith('sample-metadata');