zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-16 06:24:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'za/3307-duplicate-key-bug' into za/3280-design-review

Browse source
This commit is contained in:
zandercymatics 2025-01-23 08:58:25 -07:00
commit 9d07d4f76c
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
6 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{% if messages %} {% if messages %}
{% for message in messages %} {% for message in messages %}
<div class="usa-alert usa-alert--{{ message.tags }} usa-alert--slim margin-bottom-2"> <div class="usa-alert usa-alert--{{ message.tags }} usa-alert--slim margin-bottom-2">
<div class="usa-alert__body"> <div class="usa-alert__body {% if no_max_width %} maxw-none {% endif %}">
{{ message }} {{ message }}
</div> </div>
</div> </div>

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

@ -37,7 +37,7 @@
<div class="grid-row grid-gap"> <div class="grid-row grid-gap">
<div class="mobile:grid-col-12 tablet:grid-col-7"> <div class="mobile:grid-col-12 tablet:grid-col-7">
<h1 class="margin-bottom-3">Domain assignments</h1> <h1>Domain assignments</h1>
</div> </div>
{% if has_edit_members_portfolio_permission %} {% if has_edit_members_portfolio_permission %}
<div class="mobile:grid-col-12 tablet:grid-col-5"> <div class="mobile:grid-col-12 tablet:grid-col-5">

4
src/registrar/templates/portfolio_member_domains_edit.html
View file

@ -39,7 +39,7 @@
</nav> </nav>
<section id="domain-assignments-edit-view"> <section id="domain-assignments-edit-view">
<h1 class="margin-bottom-3">Edit domain assignments</h1> <h1>Edit domain assignments</h1>
<p class="margin-bottom-0"> <p class="margin-bottom-0">
A domain manager can be assigned to any domain across the organization. Domain managers can change domain information, adjust DNS settings, and invite or assign other domain managers to their assigned domains. A domain manager can be assigned to any domain across the organization. Domain managers can change domain information, adjust DNS settings, and invite or assign other domain managers to their assigned domains.
@ -74,7 +74,7 @@
</section> </section>
<section id="domain-assignments-readonly-view" class="display-none"> <section id="domain-assignments-readonly-view" class="display-none">
<h1 class="margin-bottom-3">Review domain assignments</h1> <h1>Review domain assignments</h1>
<h2 class="text-primary-dark">Would you like to continue with the following domain assignment changes for <h2 class="text-primary-dark">Would you like to continue with the following domain assignment changes for
{% if member %} {% if member %}

4
src/registrar/templates/portfolio_members.html
View file

@ -12,13 +12,13 @@
<!-- Form messages --> <!-- Form messages -->
{% block messages %} {% block messages %}
{% include "includes/form_messages.html" %} {% include "includes/form_messages.html" with no_max_width=True %}
{% endblock messages%} {% endblock messages%}
<div id="main-content"> <div id="main-content">
<div id="toggleable-alert" class="usa-alert usa-alert--slim margin-bottom-2 display-none"> <div id="toggleable-alert" class="usa-alert usa-alert--slim margin-bottom-2 display-none">
<div class="usa-alert__body usa-alert__body--widescreen"> <div class="usa-alert__body usa-alert__body--widescreen">
<p class="usa-alert__text "> <p class="usa-alert__text">
<!-- alert message will be conditionally populated by javascript --> <!-- alert message will be conditionally populated by javascript -->
</p> </p>
</div> </div>

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

@ -1676,8 +1676,8 @@ class TestPortfolio(WebTest):
self.assertEqual(response.status_code, 400) # Bad request due to active requests self.assertEqual(response.status_code, 400) # Bad request due to active requests
support_url = "https://get.gov/contact/" support_url = "https://get.gov/contact/"
expected_error_message = ( expected_error_message = (
f"This member has an active domain request and can't be removed from the organization. " "Please <contact us> to remove this member."
f"<a href='{support_url}' target='_blank'>Contact the .gov team</a> to remove them." f"Please <a href='{support_url}' target='_blank'>contact us</a> to remove this member."
) )
self.assertContains(response, expected_error_message, status_code=400) self.assertContains(response, expected_error_message, status_code=400)
@ -1799,8 +1799,8 @@ class TestPortfolio(WebTest):
support_url = "https://get.gov/contact/" support_url = "https://get.gov/contact/"
expected_error_message = ( expected_error_message = (
f"This member has an active domain request and can't be removed from the organization. " "Please <contact us> to remove this member."
f"<a href='{support_url}' target='_blank'>Contact the .gov team</a> to remove them." f"Please <a href='{support_url}' target='_blank'>contact us</a> to remove this member."
) )
args, kwargs = mock_error.call_args args, kwargs = mock_error.call_args

6
src/registrar/views/portfolios.py
View file

@ -117,9 +117,9 @@ class PortfolioMemberDeleteView(PortfolioMemberPermission, View):
if active_requests_count > 0: if active_requests_count > 0:
# If they have any in progress requests # If they have any in progress requests
error_message = mark_safe( # nosec error_message = mark_safe(
f"This member has an active domain request and can't be removed from the organization. " "Please <contact us> to remove this member."
f"<a href='{support_url}' target='_blank'>Contact the .gov team</a> to remove them." f"Please <a href='{support_url}' target='_blank'>contact us</a> to remove this member."
) )
elif member.is_only_admin_of_portfolio(portfolio_member_permission.portfolio): elif member.is_only_admin_of_portfolio(portfolio_member_permission.portfolio):
# If they are the last manager of a domain # If they are the last manager of a domain