Merge pull request #425 from dod-ccpo/fix-attachment-error

Fix bug where finver page tries to render task order PDF
This commit is contained in:
richard-dds
2018-11-05 14:25:51 -05:00
committed by GitHub
2 changed files with 46 additions and 7 deletions

View File

@@ -30,12 +30,12 @@ class FinancialVerificationBase(object):
_formdata = ImmutableMultiDict(formdata) if formdata is not None else None
fv = FinancialVerification(request)
form = FinancialVerificationForm(obj=fv, formdata=_formdata)
if is_extended:
try:
attachment = Attachment.get_for_resource("task_order", self.request.id)
form.task_order.pdf.data = attachment.filename
except NotFoundError:
pass
try:
attachment = Attachment.get_for_resource("task_order", self.request.id)
form.task_order.pdf.data = attachment.filename
except NotFoundError:
pass
return form
@@ -173,7 +173,7 @@ class SaveFinancialVerificationDraft(FinancialVerificationBase):
if not form.validate_draft():
self._raise(form)
if not self.pe_validator.validate(self.request, form.pe_id):
if form.pe_id.data and not self.pe_validator.validate(self.request, form.pe_id):
valid = False
if form.task_order.number.data and not self.task_order_validator.validate(