darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-25 00:33:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use USWDS error formatting for file too big error (notify-admin-1237)

Browse Source
This commit is contained in:
Kenneth Kehl
2024-03-06 11:49:19 -08:00
parent 9a62c9df27
commit 68163aa6d7
2 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/main/forms.py
View File

@@ -1226,7 +1226,11 @@ class CsvUploadForm(StripWhitespaceForm):
validators=[ validators=[
DataRequired(message="Please pick a file"), DataRequired(message="Please pick a file"),
CsvFileValidator(), CsvFileValidator(),
FileSize(max_size=10e6, message="File must be smaller than 10Mb"), # 10Mb FileSize(
max_size=10e6,
message="File must be smaller than 10Mb. If you are trying to upload an Excel file, \
please export the contents in the CSV format and then try again.",
), # 10Mb
], ],
) )

8
app/main/views/send.py
View File

@@ -6,6 +6,7 @@ from zipfile import BadZipFile
from flask import abort, flash, redirect, render_template, request, session, url_for from flask import abort, flash, redirect, render_template, request, session, url_for
from flask_login import current_user from flask_login import current_user
from markupsafe import Markup
from notifications_python_client.errors import HTTPError from notifications_python_client.errors import HTTPError
from notifications_utils import SMS_CHAR_COUNT_LIMIT from notifications_utils import SMS_CHAR_COUNT_LIMIT
from notifications_utils.insensitive_dict import InsensitiveDict from notifications_utils.insensitive_dict import InsensitiveDict
@@ -151,8 +152,11 @@ def send_messages(service_id, template_id):
# just show the first error, as we don't expect the form to have more # just show the first error, as we don't expect the form to have more
# than one, since it only has one field # than one, since it only has one field
first_field_errors = list(form.errors.values())[0] first_field_errors = list(form.errors.values())[0]
flash(first_field_errors[0]) error_message = '<span class="usa-error-message">'
error_message = f"{error_message}{first_field_errors[0]}"
error_message = f"{error_message}</span>"
error_message = Markup(error_message)
flash(error_message)
column_headings = get_spreadsheet_column_headings_from_template(template) column_headings = get_spreadsheet_column_headings_from_template(template)
return render_template( return render_template(