diff --git a/atst/forms/financial.py b/atst/forms/financial.py index 6bcabab7..a2166cb7 100644 --- a/atst/forms/financial.py +++ b/atst/forms/financial.py @@ -30,25 +30,7 @@ def coerce_choice(val): return val.value -class DraftValidateMixin(object): - def validate_draft(self): - return True - # """ - # Make all fields optional before validation, and then return them to - # their previous state. - # """ - # for field in self: - # field.validators.insert(0, Optional()) - - # valid = self.validate() - - # for field in self: - # field.validators.pop(0) - - # return valid - - -class TaskOrderForm(ValidatedForm, DraftValidateMixin): +class TaskOrderForm(ValidatedForm): def do_validate_number(self): for field in self: if field.name != "task_order-number": @@ -144,7 +126,7 @@ class TaskOrderForm(ValidatedForm, DraftValidateMixin): ) -class RequestFinancialVerificationForm(ValidatedForm, DraftValidateMixin): +class RequestFinancialVerificationForm(ValidatedForm): uii_ids = NewlineListField( "Unique Item Identifier (UII)s related to your application(s) if you already have them.", description="If you have more than one UII, place each one on a new line.", @@ -224,9 +206,6 @@ class FinancialVerificationForm(ValidatedForm): task_order_valid = self.task_order.do_validate_number() return request_valid and task_order_valid - def validate_draft(self): - return self.task_order.validate_draft() and self.request.validate_draft() - def reset(self): self.request.reset() diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index dd0ead1c..fa49af83 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -168,9 +168,6 @@ class SaveFinancialVerificationDraft(FinancialVerificationBase): def execute(self): form = self._get_form(self.request, self.is_extended, self.fv_data) - if not form.validate_draft(): - self._raise(form) - attachment = self._process_attachment(self.is_extended, form) task_order = self._try_create_task_order(form, attachment, self.is_extended) updated_request = Requests.update_financial_verification(