Merge branch 'fix-947' of https://github.com/antgonza/qiita into delete-analysis

Author: antgonza

qiita_pet/handlers/analysis_handlers.py

@@ -143,18 +143,16 @@ def get(self, analysis_id):
                                              jobject.results))
 
         dropped_samples = analysis.dropped_samples
-        dropped = {}
+        dropped = defaultdict(list)
         if dropped_samples:
             for proc_data_id, samples in viewitems(analysis.dropped_samples):
                 if not samples:
                     continue
                 proc_data = ProcessedData(proc_data_id)
                 data_type = proc_data.data_type()
                 study = proc_data.study
-                if data_type not in dropped:
-                    dropped[data_type] = []
-                dropped[data_type].append({'study': Study(study).title,
-                                           'samples': samples})
+                dropped[data_type].append((Study(study).title, len(samples),
+                                           ', '.join(samples)))
 
         self.render("analysis_results.html", analysis_id=analysis_id,
                     jobres=jobres, aname=analysis.name, dropped=dropped,

qiita_pet/templates/analysis_results.html

@@ -37,12 +37,12 @@ <h3 class="panel-title"><a data-toggle="collapse" data-parent="#accordion" href=
                   {% for data_type, studies in viewitems(dropped) %}
                     <b><u>{{data_type}}</u></b>
                     <br/><br/>
-                    {% for s in studies %}
-                      <b>{{s['study']}}:</b>
+                    {% for title, num_samples, samples in studies %}
+                      <b>{{title}}:</b>
                       <br/>
-                      Total dropped: {{len(s['samples'])}}
+                      Total dropped: {{num_samples}}
                       <br/>
-                      {{', '.join(s['samples'])}}<br/>
+                      {{samples}}<br/>
                     {% end %}
                     <hr>
                   {% end %}