Merge pull request #3742 from alphagov/fix-for-file-input-in-safari

Fix for file input bug in safari

app/templates/components/file-upload.html

@@ -2,6 +2,7 @@
 
 {% macro file_upload(
   field,
+  allowed_file_extensions,
   action=None,
   button_text="Choose file",
   alternate_link=None,
@@ -25,7 +26,8 @@
       {% endif %}
     </label>
     {{ field(**{
-      'class': 'file-upload-field'
+      'class': 'file-upload-field',
+      'accept': allowed_file_extensions|format_list_items('.{item}')|join(',')|e
     }) }}
     <label class="file-upload-button" for="{{ field.name }}">
       {{ button_text }}

app/templates/views/check/column-errors.html

@@ -137,6 +137,7 @@
       {% if not request.args.from_test %}
         {{ file_upload(
           form.file,
+          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'
         ) }}

app/templates/views/check/row-errors.html

@@ -43,6 +43,7 @@
     <div class="form-group">
       {{ file_upload(
         form.file,
+        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'
       ) }}

app/templates/views/email-branding/manage-branding.html

@@ -24,7 +24,7 @@
       <p class="govuk-body">
         Logos should be PNG files, 108px high
       </p>
-      {{ file_upload(form.file, 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>

app/templates/views/letter-branding/manage-letter-branding.html

@@ -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, 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={

app/templates/views/send.html

@@ -19,6 +19,7 @@
   <div class="page-footer bottom-gutter">
     {{file_upload(
       form.file,
+      allowed_file_extensions=allowed_file_extensions,
       button_text='Choose a file'
     )}}
   </div>

app/templates/views/uploads/choose-file.html

@@ -29,6 +29,7 @@
   <p class="govuk-body">
     {{ file_upload(
       form.file,
+      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

app/templates/views/uploads/contact-list/column-errors.html

@@ -49,6 +49,7 @@
     <div class="form-group">
       {{ file_upload(
         form.file,
+        allowed_file_extensions=allowed_file_extensions,
         action=url_for('.upload_contact_list', service_id=current_service.id),
         button_text='Upload your file again'
       ) }}

app/templates/views/uploads/contact-list/row-errors.html

@@ -44,6 +44,7 @@
     <div class="form-group">
       {{ file_upload(
         form.file,
+        allowed_file_extensions=allowed_file_extensions,
         action=url_for('.upload_contact_list', service_id=current_service.id),
         button_text='Upload your file again'
       ) }}

app/templates/views/uploads/contact-list/too-many-columns.html

@@ -58,6 +58,7 @@
     <div class="form-group">
       {{ file_upload(
         form.file,
+        allowed_file_extensions=allowed_file_extensions,
         action=url_for('.upload_contact_list', service_id=current_service.id),
         button_text='Upload your file again'
       ) }}

app/templates/views/uploads/contact-list/upload.html

@@ -35,6 +35,7 @@
 <div class="bottom-gutter">
   {{ file_upload(
     form.file,
+    allowed_file_extensions=allowed_file_extensions,
     button_text='Upload your file again' if error else 'Choose file',
     show_errors=False
   )}}

app/templates/views/uploads/preview.html

@@ -19,6 +19,7 @@
         <div class="form-group">
           {{ file_upload(
             re_upload_form.file,
+            allowed_file_extensions=['pdf'],
             action=url_for('main.upload_letter', service_id=current_service.id),
             button_text='Upload your file again'
           ) }}