Commit d2c1d7a9 authored by Lauri Himanen's avatar Lauri Himanen
Browse files

Merged with v0.7.10.

parents 7e719534 74195402
Pipeline #71456 passed with stages
in 21 minutes and 28 seconds
......@@ -21,4 +21,5 @@ target/
vscode/
nomad.yaml
gunicorn.log.conf
gunicorn.conf
\ No newline at end of file
gunicorn.conf
nomad/normalizing/data/springer.msg
......@@ -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(
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment