From e3939dfd09c5a00236288ff8348ca81bb81d2526 Mon Sep 17 00:00:00 2001
From: George Drummond <george-ctr@friends.dds.mil>
Date: Thu, 14 Feb 2019 10:16:16 -0500
Subject: [PATCH] Form fixes

---
 atst/routes/task_orders/signing.py                  |  2 ++
 templates/components/text_input.html                | 13 +++++++++++--
 .../task_orders/signing/signature_requested.html    |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/atst/routes/task_orders/signing.py b/atst/routes/task_orders/signing.py
index 61993928..e6251de3 100644
--- a/atst/routes/task_orders/signing.py
+++ b/atst/routes/task_orders/signing.py
@@ -27,6 +27,7 @@ def signature_requested(task_order_id):
     return render_template(
         "task_orders/signing/signature_requested.html",
         task_order_id=task_order.id,
+        portfolio_id=task_order.portfolio_id,
         form=SignatureForm(),
     )
 
@@ -68,6 +69,7 @@ def record_signature(task_order_id):
             render_template(
                 "task_orders/signing/signature_requested.html",
                 task_order_id=task_order_id,
+                portfolio_id=task_order.portfolio_id,
                 form=form,
             ),
             400,
diff --git a/templates/components/text_input.html b/templates/components/text_input.html
index 553f4574..b2341e7f 100644
--- a/templates/components/text_input.html
+++ b/templates/components/text_input.html
@@ -55,7 +55,9 @@
           v-on:input='onInput'
           v-on:change='onChange'
           v-bind:value='value'
+          {% if not disabled %}
           id='{{ field.name }}'
+          {% endif %}
           ref='input'
           placeholder='{{ placeholder }}'>
         </textarea>
@@ -71,11 +73,12 @@
           v-bind:pipe='pipe'
           v-bind:keep-char-positions='keepCharPositions'
           v-bind:aria-invalid='showError'
-          id='{{ field.name }}'
           type='text'
           {% if disabled %}
           disabled="disabled"
           readonly="readonly"
+          {% else %}
+          id='{{ field.name }}'
           {% endif %}
           ref='input'
           placeholder='{{ placeholder }}'>
@@ -83,7 +86,13 @@
 
       {% endif %}
 
-      <input type='hidden' v-bind:value='rawValue' name='{{ field.name }}' />
+      <input
+        type='hidden'
+        v-bind:value='rawValue'
+        {% if not disabled %}
+        name='{{ field.name }}'
+        {% endif %}
+      />
 
       <template v-if='showError'>
         <span class='usa-input__message' v-html='validationError'></span>
diff --git a/templates/task_orders/signing/signature_requested.html b/templates/task_orders/signing/signature_requested.html
index d7ff9cf5..1d3b5f35 100644
--- a/templates/task_orders/signing/signature_requested.html
+++ b/templates/task_orders/signing/signature_requested.html
@@ -42,7 +42,7 @@
         </button>
 
         <a
-          href="{{ request.referrer or url_for("atst.home") }}"
+          href="{{ url_for("portfolios.ko_review", portfolio_id=portfolio_id, task_order_id=task_order_id) }}"
           class="action-group__action icon-link">
           {{ Icon('caret_left') }}
           <span class="icon icon--x"></span>