Merge pull request #386 from dod-ccpo/edit-user-#160268937

Edit user #160268937

atst/routes/__init__.py

@@ -10,7 +10,6 @@ from atst.domain.users import Users
 from atst.domain.authnid import AuthenticationContext
 from atst.domain.audit_log import AuditLog
 from atst.domain.auth import logout as _logout
-from atst.forms.edit_user import EditUserForm
 
 
 bp = Blueprint("atst", __name__)
@@ -119,19 +118,6 @@ def activity_history():
     return render_template("audit_log.html", audit_events=audit_events)
 
 
-@bp.route("/user")
-def user():
-    form = EditUserForm(request.form)
-    user = g.current_user
-    return render_template("user/edit.html", form=form, user=user)
-
-
-@bp.route("/save_user")
-def save_user():
-    # no op
-    return redirect(url_for(".home"))
-
-
 @bp.route("/about")
 def about():
     return render_template("about.html")

atst/routes/users.py

@@ -0,0 +1,25 @@
+from flask import Blueprint, render_template, g, request as http_request
+from atst.forms.edit_user import EditUserForm
+from atst.domain.users import Users
+
+
+bp = Blueprint("users", __name__)
+
+
+@bp.route("/user")
+def user():
+    user = g.current_user
+    form = EditUserForm(data=user.to_dictionary())
+    return render_template("user/edit.html", form=form, user=user)
+
+
+@bp.route("/user", methods=["POST"])
+def update_user():
+    user = g.current_user
+    form = EditUserForm(http_request.form)
+    rerender_args = {"form": form, "user": user}
+    if form.validate():
+        Users.update(user, form.data)
+        rerender_args["updated"] = True
+
+    return render_template("user/edit.html", **rerender_args)