From 8d30fd4cfb8753146863c0278d393d23ffc0daf1 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Fri, 31 Jan 2020 11:52:15 -0500 Subject: [PATCH 1/3] Remove extra --- templates/portfolios/admin.html | 1 - 1 file changed, 1 deletion(-) diff --git a/templates/portfolios/admin.html b/templates/portfolios/admin.html index 9eed77d1..eb2f8228 100644 --- a/templates/portfolios/admin.html +++ b/templates/portfolios/admin.html @@ -54,7 +54,6 @@ {% endif %} -
From 881bf3220cb5b0750705b42b0b26c21c62d48963 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Fri, 31 Jan 2020 11:57:15 -0500 Subject: [PATCH 2/3] fix formatting --- templates/portfolios/admin.html | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/templates/portfolios/admin.html b/templates/portfolios/admin.html index eb2f8228..40721c0d 100644 --- a/templates/portfolios/admin.html +++ b/templates/portfolios/admin.html @@ -40,20 +40,20 @@ {% endif %} -
-
-
{{ "portfolios.admin.defense_component_label" | translate }}
- {% if portfolio.defense_component %} -
- {% for component in portfolio.defense_component %} - {{ "forms.portfolio.defense_component.choices.%s" | format(component) | translate }}
- {% endfor %} -
- {% else %} -
{{ "fragments.portfolio_admin.none" | translate }}
- {% endif %} -
+
+
+
{{ "portfolios.admin.defense_component_label" | translate }}
+ {% if portfolio.defense_component %} +
+ {% for component in portfolio.defense_component %} + {{ "forms.portfolio.defense_component.choices.%s" | format(component) | translate }}
+ {% endfor %} +
+ {% else %} +
{{ "fragments.portfolio_admin.none" | translate }}
+ {% endif %}
+

From b5e7ea3fa65d7c024f31b63f16b621db5aaed26b Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Fri, 31 Jan 2020 14:03:30 -0500 Subject: [PATCH 3/3] Fix column type on portfolios defense_component --- atst/models/portfolio.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/atst/models/portfolio.py b/atst/models/portfolio.py index f60ed8de..5a8f0f1e 100644 --- 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