mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-26 01:04:00 -04:00
Remove set-to-string conversion from upload code
Also changes the allowed_spreadsheet_file_extensions variable to allowed_file_extensions for consistency.
This commit is contained in:
@@ -137,7 +137,7 @@
|
||||
{% if not request.args.from_test %}
|
||||
{{ file_upload(
|
||||
form.file,
|
||||
allowed_file_extensions=allowed_spreadsheet_file_extensions,
|
||||
allowed_file_extensions=allowed_file_extensions,
|
||||
action=url_for('.send_messages', service_id=current_service.id, template_id=template.id),
|
||||
button_text='Upload your file again'
|
||||
) }}
|
||||
|
||||
@@ -43,7 +43,7 @@
|
||||
<div class="form-group">
|
||||
{{ file_upload(
|
||||
form.file,
|
||||
allowed_file_extensions=allowed_spreadsheet_file_extensions,
|
||||
allowed_file_extensions=allowed_file_extensions,
|
||||
action=url_for('.send_messages', service_id=current_service.id, template_id=template.id),
|
||||
button_text='Upload your file again'
|
||||
) }}
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
<p class="govuk-body">
|
||||
Logos should be PNG files, 108px high
|
||||
</p>
|
||||
{{ file_upload(form.file, allowed_file_extensions='.png', button_text='{} logo'.format('Update' if email_branding else 'Upload')) }}
|
||||
{{ file_upload(form.file, allowed_file_extensions=['png'], button_text='{} logo'.format('Update' if email_branding else 'Upload')) }}
|
||||
{% call form_wrapper() %}
|
||||
<div class="form-group">
|
||||
<div style='margin-top:15px;'>{{form.name}}</div>
|
||||
|
||||
@@ -24,7 +24,7 @@
|
||||
<p class="govuk-body">
|
||||
Logos should be SVG files, cropped to artwork bounds and with all fonts outlined.
|
||||
</p>
|
||||
{{ file_upload(file_upload_form.file, allowed_file_extensions='.svg', button_text='{} logo'.format('Update' if is_update else 'Upload')) }}
|
||||
{{ file_upload(file_upload_form.file, allowed_file_extensions=['svg'], button_text='{} logo'.format('Update' if is_update else 'Upload')) }}
|
||||
{% call form_wrapper() %}
|
||||
<div class="form-group">
|
||||
{{ letter_branding_details_form.name(param_extensions={
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<div class="page-footer bottom-gutter">
|
||||
{{file_upload(
|
||||
form.file,
|
||||
allowed_file_extensions=allowed_spreadsheet_file_extensions,
|
||||
allowed_file_extensions=allowed_file_extensions,
|
||||
button_text='Choose a file'
|
||||
)}}
|
||||
</div>
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<p class="govuk-body">
|
||||
{{ file_upload(
|
||||
form.file,
|
||||
allowed_file_extensions='.pdf',
|
||||
allowed_file_extensions=['pdf'],
|
||||
action=url_for('main.upload_letter', service_id=current_service.id),
|
||||
button_text='Upload your file again' if error else 'Choose file',
|
||||
show_errors=False
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
<div class="form-group">
|
||||
{{ file_upload(
|
||||
form.file,
|
||||
allowed_file_extensions=allowed_spreadsheet_file_extensions,
|
||||
allowed_file_extensions=allowed_file_extensions,
|
||||
action=url_for('.upload_contact_list', service_id=current_service.id),
|
||||
button_text='Upload your file again'
|
||||
) }}
|
||||
|
||||
@@ -44,7 +44,7 @@
|
||||
<div class="form-group">
|
||||
{{ file_upload(
|
||||
form.file,
|
||||
allowed_file_extensions=allowed_spreadsheet_file_extensions,
|
||||
allowed_file_extensions=allowed_file_extensions,
|
||||
action=url_for('.upload_contact_list', service_id=current_service.id),
|
||||
button_text='Upload your file again'
|
||||
) }}
|
||||
|
||||
@@ -58,7 +58,7 @@
|
||||
<div class="form-group">
|
||||
{{ file_upload(
|
||||
form.file,
|
||||
allowed_file_extensions=allowed_spreadsheet_file_extensions,
|
||||
allowed_file_extensions=allowed_file_extensions,
|
||||
action=url_for('.upload_contact_list', service_id=current_service.id),
|
||||
button_text='Upload your file again'
|
||||
) }}
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
<div class="bottom-gutter">
|
||||
{{ file_upload(
|
||||
form.file,
|
||||
allowed_file_extensions=allowed_spreadsheet_file_extensions,
|
||||
allowed_file_extensions=allowed_file_extensions,
|
||||
button_text='Upload your file again' if error else 'Choose file',
|
||||
show_errors=False
|
||||
)}}
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<div class="form-group">
|
||||
{{ file_upload(
|
||||
re_upload_form.file,
|
||||
allowed_file_extensions='.pdf',
|
||||
allowed_file_extensions=['pdf'],
|
||||
action=url_for('main.upload_letter', service_id=current_service.id),
|
||||
button_text='Upload your file again'
|
||||
) }}
|
||||
|
||||
Reference in New Issue
Block a user