Merge pull request #357 from bmic-development/sj-document_upload_erro…

…r_message

Sj document upload error message

app/models/document.rb

@@ -25,7 +25,7 @@ class Document < ApplicationRecord
   has_and_belongs_to_many :sub_service_requests
   belongs_to :protocol
   has_attached_file :document #, :preserve_files => true
-  validates_attachment :document, :content_type => {:content_type => %w(application/zip application/force-download text/plain image/jpeg image/jpg image/png application/vnd.ms-excel application/vnd.ms-excel.sheet.macroenabled.12 application/vnd.ms-excel.template.macroenabled.12 application/vnd.ms-excel.addin.macroenabled.12 application/vnd.ms-excel.sheet.binary.macroenabled.12 text/csv application/pdf application/msword application/vnd.ms-office application/vnd.openxmlformats-officedocument.wordprocessingml.document application/vnd.openxmlformats-officedocument.spreadsheetml.sheet)}
+  do_not_validate_attachment_file_type :document
 
   validates :doc_type, :document, presence: true
   validates :doc_type_other, presence: true, if: Proc.new { |doc| doc.doc_type == 'other' }

config/locales/en.yml

@@ -60,6 +60,8 @@ en:
           attributes:
             content:
               blank: "Content can't be blank"
+      messages:
+        spoofed_media_type: "has formatting errors. Try re-saving file as a different format, and retrying."
     attributes:
       arm:
         name: "Arm Name"