Browse Source

match csv or text file for validation

pull/1043/head
Phil Lee 4 years ago
parent
commit
5790ba99b4
  1. 4
      app/models/forms/bulk_upload_lettings/upload_your_file.rb
  2. 4
      app/models/forms/bulk_upload_sales/upload_your_file.rb

4
app/models/forms/bulk_upload_lettings/upload_your_file.rb

@ -57,10 +57,10 @@ module Forms
def validate_file_is_csv
return unless file
argv = %W[file --mime-type -- #{file.path}]
argv = %W[file --brief --mime-type -- #{file.path}]
output = `#{argv.shelljoin}`
unless output.include?("text/csv")
unless output.match?(/text\/csv|text\/plain/)
errors.add(:file, :not_csv)
end
end

4
app/models/forms/bulk_upload_sales/upload_your_file.rb

@ -57,10 +57,10 @@ module Forms
def validate_file_is_csv
return unless file
argv = %W[file --mime-type -- #{file.path}]
argv = %W[file --brief --mime-type -- #{file.path}]
output = `#{argv.shelljoin}`
unless output.include?("text/csv")
unless output.match?(/text\/csv|text\/plain/)
errors.add(:file, :not_csv)
end
end

Loading…
Cancel
Save