pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
leigh-mil 2020-01-31 14:28:37 -05:00 committed by GitHub
commit 42b3fa2b0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/models/portfolio.py
View File

@ -22,7 +22,7 @@ class Portfolio(
id = types.Id() id = types.Id()
name = Column(String, nullable=False) name = Column(String, nullable=False)
defense_component = Column( defense_component = Column(
String, nullable=False ARRAY(String), nullable=False
) # Department of Defense Component ) # Department of Defense Component
app_migration = Column(String) # App Migration app_migration = Column(String) # App Migration

25
templates/portfolios/admin.html
View File

@ -40,19 +40,18 @@
</div> </div>
{% endif %} {% endif %}
<div class='defense-row'> <div class='defense-row'>
<div> <div>
<div class='admin-title'>{{ "portfolios.admin.defense_component_label" | translate }}</div> <div class='admin-title'>{{ "portfolios.admin.defense_component_label" | translate }}</div>
{% if portfolio.defense_component %} {% if portfolio.defense_component %}
<div class='admin-content'> <div class='admin-content'>
{% for component in portfolio.defense_component %} {% for component in portfolio.defense_component %}
{{ "forms.portfolio.defense_component.choices.%s" | format(component) | translate }}<br> {{ "forms.portfolio.defense_component.choices.%s" | format(component) | translate }}<br>
{% endfor %} {% endfor %}
</div> </div>
{% else %} {% else %}
<div class='admin-content'>{{ "fragments.portfolio_admin.none" | translate }}</div> <div class='admin-content'>{{ "fragments.portfolio_admin.none" | translate }}</div>
{% endif %} {% endif %}
</div>
</div> </div>
</div> </div>
</section> </section>