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

Merge branch 'main' into nmb/rbac

Browse source
This commit is contained in:
Neil Martinsen-Burrell 2023-03-06 12:03:53 -06:00
commit bd897695d7
No known key found for this signature in database
GPG key ID: 6A3C818CC10D0184
2 changed files with 9 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/registrar/templates/includes/form_errors.html
View file

@ -1,8 +1,3 @@
{% comment %}
This only shows non-field errors at the top of form pages.
The individual field errors are not shown at the top of the
page, they are shown on each individual field.
{% endcomment %}
{% if form.errors %} {% if form.errors %}
{% for error in form.non_field_errors %} {% for error in form.non_field_errors %}
<div class="usa-alert usa-alert--error usa-alert--slim margin-bottom-2"> <div class="usa-alert usa-alert--error usa-alert--slim margin-bottom-2">
@ -11,4 +6,13 @@ page, they are shown on each individual field.
</div> </div>
</div> </div>
{% endfor %} {% endfor %}
{% for field in form %}
{% for error in field.errors %}
<div class="usa-alert usa-alert--error usa-alert--slim margin-bottom-2">
<div class="usa-alert__body">
{{ error|escape }}
</div>
</div>
{% endfor %}
{% endfor %}
{% endif %} {% endif %}

14
src/registrar/views/application.py
View file

@ -7,7 +7,6 @@ from django.urls import resolve, reverse
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.views.generic import TemplateView from django.views.generic import TemplateView
from django.contrib import messages from django.contrib import messages
from django.utils.safestring import mark_safe
from registrar.forms import application_wizard as forms from registrar.forms import application_wizard as forms
from registrar.models import DomainApplication from registrar.models import DomainApplication
@ -321,19 +320,6 @@ class ApplicationWizard(LoginRequiredMixin, TemplateView):
# always save progress # always save progress
self.save(forms) self.save(forms)
else: else:
# unless there are errors
# no sec because this use of mark_safe does not introduce a cross-site
# scripting vulnerability because there is no untrusted content inside.
# It is only being used to pass a specific HTML entity into a template.
messages.warning(
request,
mark_safe( # nosec
"<b>We could not save all the fields.</b><br/> The highlighted "
+ "fields below <b>could not be saved</b> because they have "
+ "missing or invalid data. All other information on this page "
+ "has been saved."
),
)
context = self.get_context_data() context = self.get_context_data()
context["forms"] = forms context["forms"] = forms
return render(request, self.template_name, context) return render(request, self.template_name, context)