From 16064be4688fb2608591e870d08a8fe5c94231cb Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Mon, 10 Dec 2018 12:50:01 -0500
Subject: [PATCH] flash form error message from our base form class

---
 atst/forms/forms.py                   | 8 ++++++++
 atst/routes/requests/approval.py      | 3 ---
 atst/routes/requests/requests_form.py | 1 -
 atst/routes/users.py                  | 2 --
 atst/routes/workspaces/index.py       | 2 --
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/atst/forms/forms.py b/atst/forms/forms.py
index eeeb48d2..34c861f2 100644
--- a/atst/forms/forms.py
+++ b/atst/forms/forms.py
@@ -1,6 +1,8 @@
 from flask_wtf import FlaskForm
 from flask import current_app, request as http_request
 
+from atst.utils.flash import formatted_flash as flash
+
 
 class ValidatedForm(FlaskForm):
     def perform_extra_validation(self, *args, **kwargs):
@@ -14,6 +16,12 @@ class ValidatedForm(FlaskForm):
         _data.pop("csrf_token", None)
         return _data
 
+    def validate(self, *args, **kwargs):
+        valid = super().validate(*args, **kwargs)
+        if not valid:
+            flash("form_errors")
+        return valid
+
 
 class CacheableForm(ValidatedForm):
     def __init__(self, formdata=None, **kwargs):
diff --git a/atst/routes/requests/approval.py b/atst/routes/requests/approval.py
index 5b0e338c..41a6d6eb 100644
--- a/atst/routes/requests/approval.py
+++ b/atst/routes/requests/approval.py
@@ -13,7 +13,6 @@ from atst.domain.requests import Requests
 from atst.domain.exceptions import NotFoundError
 from atst.forms.ccpo_review import CCPOReviewForm
 from atst.forms.internal_comment import InternalCommentForm
-from atst.utils.flash import formatted_flash as flash
 
 
 def map_ccpo_authorizing(user):
@@ -64,7 +63,6 @@ def submit_approval(request_id):
 
         return redirect(url_for("requests.requests_index"))
     else:
-        flash("form_errors")
         return render_approval(request, form)
 
 
@@ -96,5 +94,4 @@ def create_internal_comment(request_id):
             url_for("requests.approval", request_id=request_id, _anchor="ccpo-notes")
         )
     else:
-        flash("form_errors")
         return render_approval(request, internal_comment_form=form)
diff --git a/atst/routes/requests/requests_form.py b/atst/routes/requests/requests_form.py
index 98c25596..5a77e56f 100644
--- a/atst/routes/requests/requests_form.py
+++ b/atst/routes/requests/requests_form.py
@@ -112,7 +112,6 @@ def requests_update(screen=1, request_id=None):
             where = "/requests"
         return redirect(where)
     else:
-        flash("form_errors")
         rerender_args = dict(
             f=jedi_flow.form,
             data=post_data,
diff --git a/atst/routes/users.py b/atst/routes/users.py
index 24b4d566..5aa720d6 100644
--- a/atst/routes/users.py
+++ b/atst/routes/users.py
@@ -29,7 +29,5 @@ def update_user():
         flash("user_updated")
         if next_url:
             return redirect(next_url)
-    else:
-        flash("form_errors")
 
     return render_template("user/edit.html", form=form, user=user, next=next_url)
diff --git a/atst/routes/workspaces/index.py b/atst/routes/workspaces/index.py
index facc3ae2..a92ead98 100644
--- a/atst/routes/workspaces/index.py
+++ b/atst/routes/workspaces/index.py
@@ -8,7 +8,6 @@ from atst.domain.workspaces import Workspaces
 from atst.forms.workspace import WorkspaceForm
 from atst.domain.authz import Authorization
 from atst.models.permissions import Permissions
-from atst.utils.flash import formatted_flash as flash
 
 
 @workspaces_bp.route("/workspaces")
@@ -34,7 +33,6 @@ def edit_workspace(workspace_id):
             url_for("workspaces.workspace_projects", workspace_id=workspace.id)
         )
     else:
-        flash("form_errors")
         return render_template("workspaces/edit.html", form=form, workspace=workspace)