Merge branch 'staging' into download-and-email-tos

2020-01-31 14:28:37 -05:00 · 2020-01-31 14:28:37 -05:00 · 42b3fa2b0c
commit 42b3fa2b0c
parent e32e211966 3737219995
2 changed files with 13 additions and 14 deletions
--- a/atst/models/portfolio.py
+++ b/atst/models/portfolio.py
@ -22,7 +22,7 @@ class Portfolio(
    id = types.Id()
    name = Column(String, nullable=False)
    defense_component = Column(
-        String, nullable=False
+        ARRAY(String), nullable=False
    )  # Department of Defense Component

    app_migration = Column(String)  # App Migration
--- a/templates/portfolios/admin.html
+++ b/templates/portfolios/admin.html
@ -54,7 +54,6 @@
          {% endif %}
        </div>
      </div>
-      </div>
    </section>

    <hr>