From 454643c3c94fd2b032238ad457731ee79439a2d5 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Fri, 7 Jun 2019 12:37:03 -0400
Subject: [PATCH] Post rebase fixes

---
 atst/forms/task_order.py        | 1 +
 js/components/forms/to_form.js  | 2 ++
 templates/task_orders/edit.html | 8 +++++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/atst/forms/task_order.py b/atst/forms/task_order.py
index 4e3aaaf0..c62cf906 100644
--- a/atst/forms/task_order.py
+++ b/atst/forms/task_order.py
@@ -2,6 +2,7 @@ from wtforms.fields import BooleanField, DecimalField, FieldList, FileField, For
 from wtforms.fields.html5 import DateField
 from wtforms.validators import Required, Optional
 from flask_wtf.file import FileAllowed
+from flask_wtf import FlaskForm
 
 from .data import JEDI_CLIN_TYPES
 from .fields import SelectField
diff --git a/js/components/forms/to_form.js b/js/components/forms/to_form.js
index 49913beb..e807229a 100644
--- a/js/components/forms/to_form.js
+++ b/js/components/forms/to_form.js
@@ -3,6 +3,7 @@ import DateSelector from '../date_selector'
 import FormMixin from '../../mixins/form'
 import optionsinput from '../options_input'
 import textinput from '../text_input'
+import uploadinput from '../upload_input'
 
 export default {
   name: 'to-form',
@@ -14,6 +15,7 @@ export default {
     DateSelector,
     optionsinput,
     textinput,
+    uploadinput,
   },
 
   props: {
diff --git a/templates/task_orders/edit.html b/templates/task_orders/edit.html
index 6883a5d0..4d2a0816 100644
--- a/templates/task_orders/edit.html
+++ b/templates/task_orders/edit.html
@@ -21,13 +21,13 @@
 {% block portfolio_content %}
   <div class="col task-order-form">
     {% include "fragments/flash.html" %}
-      <to-form inline-template v-bind:initial-clin-count='{{ form.clins.data | length }}'>
+      <to-form inline-template v-bind:initial-clin-count="{{ form.clins.data | length }}">
         {% if task_order_id %}
           {% set action = url_for("task_orders.update", portfolio_id=portfolio.id, task_order_id=task_order_id) %}
         {% else %}
           {% set action = url_for("task_orders.update", portfolio_id=portfolio.id) %}
         {% endif %}
-        <form id="new-task-order" action='{{ action }}' method="POST" autocomplete="off">
+        <form id="new-task-order" action='{{ action }}' method="POST" autocomplete="off" enctype="multipart/form-data">
           {{ form.csrf_token }}
             <!-- TODO: implement save bar with component -->
             <span class="h3">Add Funding</span>
@@ -38,7 +38,9 @@
               {{ "common.cancel" | translate }}
             </a>
             <input type="submit" tabindex="0" value="Save" form="new-task-order" class="usa-button usa-button-primary">
-            {{ "task_orders.new.form_help_text" | translate }}
+            <p>
+              {{ "task_orders.new.form_help_text" | translate }}
+            </p>
             <hr>
             {{ TextInput(form.number, validation='taskOrderNumber') }}
             {% for clin in form.clins %}