From 04fea2539448c3b4d979c1cd85c000f4c42ad46a Mon Sep 17 00:00:00 2001 From: George Drummond Date: Mon, 11 Feb 2019 10:11:22 -0500 Subject: [PATCH] Pass signer_dod_id and signed_at directly to the update method --- atst/forms/task_order.py | 4 ---- atst/routes/task_orders/signing.py | 10 +++++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/atst/forms/task_order.py b/atst/forms/task_order.py index e776c3a1..b731e2bd 100644 --- a/atst/forms/task_order.py +++ b/atst/forms/task_order.py @@ -225,10 +225,6 @@ class ReviewForm(CacheableForm): class SignatureForm(CacheableForm): - signer_dod_id = StringField("signer_dod_id") - - signed_at = StringField("signed_at") - level_of_warrant = DecimalField( translate("task_orders.sign.level_of_warrant_label"), description=translate("task_orders.sign.level_of_warrant_description"), diff --git a/atst/routes/task_orders/signing.py b/atst/routes/task_orders/signing.py index fe8c440e..3c0458cd 100644 --- a/atst/routes/task_orders/signing.py +++ b/atst/routes/task_orders/signing.py @@ -37,8 +37,6 @@ def record_signature(task_order_id): task_order = find_unsigned_ko_to(task_order_id) form_data = {**http_request.form} - form_data["signer_dod_id"] = g.current_user.dod_id - form_data["signed_at"] = datetime.datetime.now() if "unlimited_level_of_warrant" in form_data and form_data[ "unlimited_level_of_warrant" @@ -48,7 +46,13 @@ def record_signature(task_order_id): form = SignatureForm(form_data) if form.validate(): - TaskOrders.update(user=g.current_user, task_order=task_order, **form.data) + TaskOrders.update( + user=g.current_user, + task_order=task_order, + signer_dod_id=g.current_user.dod_id, + signed_at=datetime.datetime.now(), + **form.data, + ) return render_template("task_orders/signing/success.html"), 201 else: return (