Sort uploads by collection id

neuroscout/resources/analysis/endpoints.py

@@ -10,7 +10,7 @@
 import json
 import requests
 
-from ...utils.db import put_record
+from ...utils.db import put_record, delete_analysis
 from .bib import format_bibliography, find_predictor_citation, _flatten
 from ..utils import owner_required, auth_required, fetch_analysis, abort
 from ..predictor import get_predictors
@@ -81,14 +81,8 @@ def put(self, analysis, **kwargs):
     def delete(self, analysis):
         if analysis.status not in ['DRAFT', 'FAILED'] or analysis.locked:
             abort(422, "Analysis not editable, cannot delete.")
-
-        analysis.runs = []
-
-        # Delete reports
-        Report.query.filter_by(analysis_id=analysis.hash_id).delete()
-
-        db.session.delete(analysis)
-        db.session.commit()
+
+        delete_analysis(analysis)
 
         return {'message': 'deleted!'}, 200
 

neuroscout/resources/analysis/reports.py

@@ -259,4 +259,4 @@ def post(self, analysis, validation_hash, collection_id=None,
     @fetch_analysis
     def get(self, analysis):
         return NeurovaultCollection.query.filter_by(
-            analysis_id=analysis.hash_id)
+            analysis_id=analysis.hash_id).order_by('collection_id')

neuroscout/schemas/predictor.py

@@ -24,7 +24,7 @@ class PredictorSchema(Schema):
     min = fields.Float(description="Minimum value")
     mean = fields.Float(description="Mean value")
     num_na = fields.Int(description="Numbers of n/as")
-    
+
     dataset_id = fields.Int()
 
     @post_dump