Merge pull request #2170 from sparc-request/saw-txt-upload-bug

SAW - Plain text document upload bug
sparc-request · Jan 24, 2020 · bc6083b · bc6083b
2 parents b862b59 + e4c5a20
commit bc6083b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/app/models/document.rb b/app/models/document.rb
@@ -24,10 +24,10 @@ class Document < ApplicationRecord
   audited
 
   SUPPORTED_FILE_TYPES = [
-    /\.pdf$/i,  /\.docx?$/i,  /\.xlsx?$/i,  /\.rtf$/i,
-    /\.txt$/i,  /\.csv$/i,    /\.ppt?$/i,   /\.msg$/i,
-    /\.eml$/i,  /\.jpg$/i,    /\.gif$/i,    /\.png$/i,
-    /\.tiff$/i, /\.jpeg$/i
+    /\.pdf$/i,  /\.docx?$/i, /\.xlsx?$/i, /\.txt$/i,
+    /\.csv$/i,  /\.ppt?$/i,  /\.msg$/i,   /\.eml$/i,
+    /\.jpg$/i,  /\.gif$/i,   /\.png$/i,   /\.tiff$/i,
+    /\.jpeg$/i
   ]
 
   belongs_to :protocol

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -267,6 +267,12 @@ en:
             visit_groups:
               invalid: "Please specify a day for each visit"
               out_of_order: "Please make sure all visit days are in sequential order"
+        document:
+          attributes:
+            document:
+              spoofed_media_type: "File type does not match file content"
+            document_file_name:
+              invalid: "Invalid file type"
         form:
           attributes:
             active: