From 3215cfca32013781c2df988f0fbb72bbc8eb8420 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 19 Nov 2018 14:37:24 -0500 Subject: [PATCH] Rename to CacheableForm --- atst/forms/ccpo_review.py | 4 ++-- atst/forms/edit_user.py | 4 ++-- atst/forms/financial.py | 8 ++++---- atst/forms/forms.py | 4 ++-- atst/forms/internal_comment.py | 4 ++-- atst/forms/new_request.py | 10 +++++----- atst/forms/workspace.py | 4 ++-- atst/routes/requests/financial_verification.py | 2 +- atst/routes/requests/requests_form.py | 9 +-------- 9 files changed, 21 insertions(+), 28 deletions(-) diff --git a/atst/forms/ccpo_review.py b/atst/forms/ccpo_review.py index b2413a3e..b727cea0 100644 --- a/atst/forms/ccpo_review.py +++ b/atst/forms/ccpo_review.py @@ -2,11 +2,11 @@ from wtforms.fields.html5 import EmailField, TelField from wtforms.fields import StringField, TextAreaField from wtforms.validators import Email, Optional -from .forms import ValidatedForm +from .forms import CacheableForm from .validators import Name, PhoneNumber -class CCPOReviewForm(ValidatedForm): +class CCPOReviewForm(CacheableForm): comment = TextAreaField( "Instructions or comments", description="Provide instructions or notes for additional information that is necessary to approve the request here. The requestor may then re-submit the updated request or initiate contact outside of AT-AT if further discussion is required. This message will be shared with the person making the JEDI request..", diff --git a/atst/forms/edit_user.py b/atst/forms/edit_user.py index 3728bf84..6d406942 100644 --- a/atst/forms/edit_user.py +++ b/atst/forms/edit_user.py @@ -5,7 +5,7 @@ from wtforms.fields import RadioField, StringField from wtforms.validators import Email, DataRequired, Optional from .fields import SelectField -from .forms import ValidatedForm +from .forms import CacheableForm from .data import SERVICE_BRANCHES from atst.models.user import User @@ -77,7 +77,7 @@ def inherit_user_field(field_name): return inherit_field(USER_FIELDS[field_name], required=required) -class EditUserForm(ValidatedForm): +class EditUserForm(CacheableForm): first_name = inherit_user_field("first_name") last_name = inherit_user_field("last_name") diff --git a/atst/forms/financial.py b/atst/forms/financial.py index cfc86a20..7ee17cfa 100644 --- a/atst/forms/financial.py +++ b/atst/forms/financial.py @@ -7,7 +7,7 @@ from flask_wtf.file import FileAllowed from werkzeug.datastructures import FileStorage from .fields import NewlineListField, SelectField, NumberStringField -from atst.forms.forms import ValidatedForm +from atst.forms.forms import CacheableForm from .data import FUNDING_TYPES from .validators import DateRange @@ -31,7 +31,7 @@ def coerce_choice(val): return val.value -class TaskOrderForm(ValidatedForm): +class TaskOrderForm(CacheableForm): def do_validate_number(self): for field in self: if field.name != "task_order-number": @@ -127,7 +127,7 @@ class TaskOrderForm(ValidatedForm): ) -class RequestFinancialVerificationForm(ValidatedForm): +class RequestFinancialVerificationForm(CacheableForm): 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.", @@ -174,7 +174,7 @@ class RequestFinancialVerificationForm(ValidatedForm): self.uii_ids.process_data(self.uii_ids.data) -class FinancialVerificationForm(ValidatedForm): +class FinancialVerificationForm(CacheableForm): task_order = FormField(TaskOrderForm) request = FormField(RequestFinancialVerificationForm) diff --git a/atst/forms/forms.py b/atst/forms/forms.py index 44405b56..eeeb48d2 100644 --- a/atst/forms/forms.py +++ b/atst/forms/forms.py @@ -2,7 +2,7 @@ from flask_wtf import FlaskForm from flask import current_app, request as http_request -class _ValidatedForm(FlaskForm): +class ValidatedForm(FlaskForm): def perform_extra_validation(self, *args, **kwargs): """Performs any applicable extra validation. Must return True if the form is valid or False otherwise.""" @@ -15,7 +15,7 @@ class _ValidatedForm(FlaskForm): return _data -class ValidatedForm(_ValidatedForm): +class CacheableForm(ValidatedForm): def __init__(self, formdata=None, **kwargs): formdata = formdata or {} cached_data = current_app.form_cache.from_request(http_request) diff --git a/atst/forms/internal_comment.py b/atst/forms/internal_comment.py index 583db7a1..7711ff04 100644 --- a/atst/forms/internal_comment.py +++ b/atst/forms/internal_comment.py @@ -1,10 +1,10 @@ from wtforms.fields import TextAreaField from wtforms.validators import InputRequired -from .forms import ValidatedForm +from .forms import CacheableForm -class InternalCommentForm(ValidatedForm): +class InternalCommentForm(CacheableForm): text = TextAreaField( "CCPO Internal Notes", default="", diff --git a/atst/forms/new_request.py b/atst/forms/new_request.py index 4b564c37..bc05f412 100644 --- a/atst/forms/new_request.py +++ b/atst/forms/new_request.py @@ -4,7 +4,7 @@ from wtforms.fields import BooleanField, RadioField, StringField, TextAreaField from wtforms.validators import Email, Length, Optional, InputRequired, DataRequired from .fields import SelectField -from .forms import ValidatedForm +from .forms import CacheableForm from .edit_user import USER_FIELDS, inherit_field from .data import ( SERVICE_BRANCHES, @@ -16,7 +16,7 @@ from .validators import DateRange, IsNumber from atst.domain.requests import Requests -class DetailsOfUseForm(ValidatedForm): +class DetailsOfUseForm(CacheableForm): def validate(self, *args, **kwargs): if self.jedi_migration.data == "no": self.rationalization_software_systems.validators.append(Optional()) @@ -162,7 +162,7 @@ class DetailsOfUseForm(ValidatedForm): ) -class InformationAboutYouForm(ValidatedForm): +class InformationAboutYouForm(CacheableForm): fname_request = inherit_field(USER_FIELDS["first_name"]) lname_request = inherit_field(USER_FIELDS["last_name"]) email_request = inherit_field(USER_FIELDS["email"]) @@ -174,7 +174,7 @@ class InformationAboutYouForm(ValidatedForm): date_latest_training = inherit_field(USER_FIELDS["date_latest_training"]) -class WorkspaceOwnerForm(ValidatedForm): +class WorkspaceOwnerForm(CacheableForm): def validate(self, *args, **kwargs): if self.am_poc.data: # Prepend Optional validators so that the validation chain @@ -203,5 +203,5 @@ class WorkspaceOwnerForm(ValidatedForm): ) -class ReviewAndSubmitForm(ValidatedForm): +class ReviewAndSubmitForm(CacheableForm): reviewed = BooleanField("I have reviewed this data and it is correct.") diff --git a/atst/forms/workspace.py b/atst/forms/workspace.py index 9fde98bb..5434676f 100644 --- a/atst/forms/workspace.py +++ b/atst/forms/workspace.py @@ -1,10 +1,10 @@ from wtforms.fields import StringField from wtforms.validators import Length -from .forms import ValidatedForm +from .forms import CacheableForm -class WorkspaceForm(ValidatedForm): +class WorkspaceForm(CacheableForm): name = StringField( "Workspace Name", validators=[ diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index 65c6d8ed..8f2369ac 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -1,4 +1,4 @@ -from flask import g, render_template, redirect, url_for, current_app as app +from flask import g, render_template, redirect, url_for from flask import request as http_request from werkzeug.datastructures import ImmutableMultiDict, FileStorage diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py index 617b0940..c88c1c38 100644 --- a/atst/routes/requests/requests_form.py +++ b/atst/routes/requests/requests_form.py @@ -1,11 +1,4 @@ -from flask import ( - g, - redirect, - render_template, - url_for, - request as http_request, - current_app, -) +from flask import g, redirect, render_template, url_for, request as http_request from . import requests_bp from atst.domain.requests import Requests