Merged with v0.7.10.

.gitignore

@@ -22,3 +22,4 @@ vscode/
 nomad.yaml
 gunicorn.log.conf
 gunicorn.conf
+nomad/normalizing/data/springer.msg

nomad/app/api/upload.py

@@ -380,7 +380,7 @@ class UploadResource(Resource):
 
             order_by = ('-%s' if order == -1 else '+%s') % order_by
 
-        calcs = upload.all_calcs((page - 1) * per_page, page * per_page, order_by=order_by)
+        calcs = list(upload.all_calcs((page - 1) * per_page, page * per_page, order_by=order_by))
         failed_calcs = upload.failed_calcs
         result = ProxyUpload(upload, {
             'pagination': dict(