zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-27 04:58:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix stacked alerts

Browse source
This commit is contained in:
Rebecca Hsieh 2024-10-29 12:34:50 -07:00
parent c0e740fe3d
commit 9459fa9a0c
No known key found for this signature in database
3 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/registrar/assets/js/get-gov.js
View file

@ -279,7 +279,7 @@ function deleteMember(member_delete_url, pageToDisplay) {
*/ */
function addAlert(alertClass, alertMessage) { function addAlert(alertClass, alertMessage) {
let toggleableAlertDiv = document.getElementById("toggleable-alert"); let toggleableAlertDiv = document.getElementById("toggleable-alert");
this.resetAlert(); this.resetAlerts();
toggleableAlertDiv.classList.add(`usa-alert--${alertClass}`); toggleableAlertDiv.classList.add(`usa-alert--${alertClass}`);
let alertParagraph = toggleableAlertDiv.querySelector(".usa-alert__text"); let alertParagraph = toggleableAlertDiv.querySelector(".usa-alert__text");
alertParagraph.innerHTML = alertMessage alertParagraph.innerHTML = alertMessage
@ -290,7 +290,11 @@ function addAlert(alertClass, alertMessage) {
* Resets the reusable alert message * Resets the reusable alert message
* *
*/ */
function resetAlert() { function resetAlerts() {
// Create a list of any alert that's leftover and remove
document.querySelectorAll(".usa-alert:not(#toggleable-alert)").forEach(alert => {
alert.remove();
});
let toggleableAlertDiv = document.getElementById("toggleable-alert"); let toggleableAlertDiv = document.getElementById("toggleable-alert");
toggleableAlertDiv.classList.remove('usa-alert--error'); toggleableAlertDiv.classList.remove('usa-alert--error');
toggleableAlertDiv.classList.remove('usa-alert--success'); toggleableAlertDiv.classList.remove('usa-alert--success');

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

@ -9,9 +9,6 @@
{% endblock %} {% endblock %}
{% block portfolio_content %} {% block portfolio_content %}
{% block messages %}
{% include "includes/form_messages.html" %}
{% endblock %}
<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">

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

@ -115,7 +115,7 @@ class PortfolioMemberDeleteView(PortfolioMemberPermission, View):
support_url = "https://get.gov/contact/" support_url = "https://get.gov/contact/"
error_message = '' error_message = ""
if active_requests_count > 0: if active_requests_count > 0:
# If they have any in progress requests # If they have any in progress requests
@ -133,14 +133,12 @@ class PortfolioMemberDeleteView(PortfolioMemberPermission, View):
if error_message: if error_message:
if request.headers.get("X-Requested-With") == "XMLHttpRequest": if request.headers.get("X-Requested-With") == "XMLHttpRequest":
return JsonResponse( return JsonResponse(
{ {"error": error_message},
"error": error_message
},
status=400, status=400,
) )
else: else:
messages.error(request, error_message) messages.error(request, error_message)
return redirect(reverse('member', kwargs={'pk': pk})) return redirect(reverse("member", kwargs={"pk": pk}))
# passed all error conditions # passed all error conditions
portfolio_member_permission.delete() portfolio_member_permission.delete()
@ -150,7 +148,7 @@ class PortfolioMemberDeleteView(PortfolioMemberPermission, View):
return JsonResponse({"success": success_message}, status=200) return JsonResponse({"success": success_message}, status=200)
else: else:
messages.success(request, success_message) messages.success(request, success_message)
return redirect(reverse('members')) return redirect(reverse("members"))
class PortfolioMemberEditView(PortfolioMemberEditPermissionView, View): class PortfolioMemberEditView(PortfolioMemberEditPermissionView, View):