zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-14 05:29:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix merge conflict

Browse source
This commit is contained in:
zandercymatics 2024-04-17 15:32:13 -06:00
parent 82c88b2876
commit a51c80f333
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 23 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/registrar/templates/django/admin/includes/detail_table_fieldset.html
View file

@ -71,14 +71,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html)
<label aria-label="Creator contact details"></label> <label aria-label="Creator contact details"></label>
{% include "django/admin/includes/contact_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %} {% include "django/admin/includes/contact_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %}
</div> </div>
<div class="flex-container">
<label aria-label="User summary details"></label>
{% include "django/admin/includes/user_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %} {% include "django/admin/includes/user_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %}
</div>
<div class="flex-container">
<label aria-label="User summary details"></label>
{% include "django/admin/includes/user_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %}
</div>
{% elif field.field.name == "submitter" %} {% elif field.field.name == "submitter" %}
<div class="flex-container"> <div class="flex-container">
<label aria-label="Submitter contact details"></label> <label aria-label="Submitter contact details"></label>

3
src/registrar/templates/django/admin/includes/user_detail_list.html
View file

@ -5,6 +5,8 @@
{% with rejected_requests_count=user.get_rejected_requests_count %} {% with rejected_requests_count=user.get_rejected_requests_count %}
{% with ineligible_requests_count=user.get_ineligible_requests_count %} {% with ineligible_requests_count=user.get_ineligible_requests_count %}
{% if approved_domains_count|add:active_requests_count|add:rejected_requests_count|add:ineligible_requests_count > 0 %} {% if approved_domains_count|add:active_requests_count|add:rejected_requests_count|add:ineligible_requests_count > 0 %}
<div class="flex-container">
<label aria-label="User summary details"></label>
<ul class="dja-status-list"> <ul class="dja-status-list">
{% if approved_domains_count > 0 %} {% if approved_domains_count > 0 %}
{# Approved domains #} {# Approved domains #}
@ -23,6 +25,7 @@
<li>Ineligible requests: {{ ineligible_requests_count }}</li> <li>Ineligible requests: {{ ineligible_requests_count }}</li>
{% endif %} {% endif %}
</ul> </ul>
</div>
{% endif %} {% endif %}
{% endwith %} {% endwith %}
{% endwith %} {% endwith %}