Merge pull request #886 from dod-ccpo/upload-fixes

Upload fixes
This commit is contained in:
dandds
2019-06-12 11:21:40 -04:00
committed by GitHub
6 changed files with 26 additions and 9 deletions

View File

@@ -1,7 +1,10 @@
from datetime import datetime
import re
from werkzeug.datastructures import FileStorage
from wtforms.validators import ValidationError, StopValidation
import pendulum
from datetime import datetime
from atst.utils.localization import translate
@@ -103,7 +106,7 @@ def RequiredIf(criteria_function, message=translate("forms.validators.is_require
def FileLength(max_length=50000000, message=None):
def _file_length(_form, field):
if field.data is None:
if field.data is None or not isinstance(field.data, FileStorage):
return True
content = field.data.read()

View File

@@ -42,7 +42,12 @@ def edit(portfolio_id, task_order_id=None):
def update(portfolio_id, task_order_id=None):
form_data = {**http_request.form, **http_request.files}
form = TaskOrderForm(form_data)
form = None
if task_order_id:
task_order = TaskOrders.get(task_order_id)
form = TaskOrderForm(form_data, obj=task_order)
else:
form = TaskOrderForm(form_data)
if form.validate():
task_order = None