Merge branch 'staging' into azure-subscriptions

2020-01-31 14:41:39 -05:00
parent afcc4d16cd 3737219995
commit 670e135a0e
16 changed files with 60 additions and 33 deletions
--- a/atst/routes/task_orders/new.py
+++ b/atst/routes/task_orders/new.py
@@ -24,6 +24,7 @@ def render_task_orders_edit(

    render_args["contract_start"] = app.config.get("CONTRACT_START_DATE")
    render_args["contract_end"] = app.config.get("CONTRACT_END_DATE")
+    render_args["file_size_limit"] = int(app.config.get("FILE_SIZE_LIMIT"))

    if task_order_id:
        task_order = TaskOrders.get(task_order_id)