zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-03 09:43:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix logic after pulling from latest

Browse source
This commit is contained in:
zandercymatics 2024-07-26 11:04:57 -06:00
parent 1053efc68c
commit 74927fd1f7
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
4 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/templates/domain_detail.html
View file

@ -53,7 +53,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
{% if portfolio %} {% if is_org_user %}
{% comment %} TODO - uncomment in #2352 and add to edit_link {% comment %} TODO - uncomment in #2352 and add to edit_link
{% url 'domain-suborganization' pk=domain.id as url %} {% url 'domain-suborganization' pk=domain.id as url %}
{% endcomment %} {% endcomment %}

2
src/registrar/templates/domain_sidebar.html
View file

@ -8,7 +8,7 @@
{% include "includes/domain_sidenav_item.html" with item_text="Domain overview" %} {% include "includes/domain_sidenav_item.html" with item_text="Domain overview" %}
{% endwith %} {% endwith %}
{% if portfolio %} {% if is_org_user %}
{% comment %} TODO - uncomment in #2352 {% comment %} TODO - uncomment in #2352
{% with url_name="domain-suborganization" %} {% with url_name="domain-suborganization" %}
{% include "includes/domain_sidenav_item.html" with item_text="Suborganization" %} {% include "includes/domain_sidenav_item.html" with item_text="Suborganization" %}

2
src/registrar/templates/includes/domains_table.html
View file

@ -143,7 +143,7 @@
<th data-sortable="expiration_date" scope="col" role="columnheader">Expires</th> <th data-sortable="expiration_date" scope="col" role="columnheader">Expires</th>
<th data-sortable="state_display" scope="col" role="columnheader">Status</th> <th data-sortable="state_display" scope="col" role="columnheader">Status</th>
<!-- Use portfolio_base_permission when merging into 2366 then delete this comment --> <!-- Use portfolio_base_permission when merging into 2366 then delete this comment -->
{% if portfolio %} {% if is_org_user %}
<th data-sortable="suborganization" scope="col" role="columnheader">Suborganization</th> <th data-sortable="suborganization" scope="col" role="columnheader">Suborganization</th>
{% endif %} {% endif %}
<th <th

8
src/registrar/tests/test_views_domain.py
View file

@ -1112,10 +1112,18 @@ class TestDomainSeniorOfficial(TestDomainOverview):
# Add a portfolio to the current domain # Add a portfolio to the current domain
portfolio = Portfolio.objects.create(creator=self.user, organization_name="Ice Cream") portfolio = Portfolio.objects.create(creator=self.user, organization_name="Ice Cream")
Suborganization.objects.create(portfolio=portfolio, name="Vanilla") Suborganization.objects.create(portfolio=portfolio, name="Vanilla")
# Add the portfolio to the domain_information object
self.domain_information.portfolio = portfolio self.domain_information.portfolio = portfolio
self.domain_information.save() self.domain_information.save()
self.domain_information.refresh_from_db() self.domain_information.refresh_from_db()
# Add portfolio perms to the user object
self.user.portfolio = portfolio
self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
self.user.save()
self.user.refresh_from_db()
# Add a SO to the portfolio # Add a SO to the portfolio
senior_official = SeniorOfficial.objects.create(first_name="Bob", last_name="Unoriginal") senior_official = SeniorOfficial.objects.create(first_name="Bob", last_name="Unoriginal")
portfolio.senior_official = senior_official portfolio.senior_official = senior_official