Merge pull request #24 from bmic-development/jjh-protocol-xlsx

Truncate long filenames for Protocol export [#137891257]
bmic-development · Jan 19, 2017 · 1977127 · 1977127
2 parents 06149a4 + bc1ea77
commit 1977127
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/dashboard/protocols_controller.rb b/app/controllers/dashboard/protocols_controller.rb
@@ -83,7 +83,7 @@ def show
         render
       }
       format.xlsx {
-        @statuses_hidden = params[:statuses_hidden]
+        @statuses_hidden = params[:statuses_hidden] || %w(draft first_draft)
         response.headers['Content-Disposition'] = "attachment; filename=\"(#{@protocol.id}) Consolidated Corporate Study Budget.xlsx\""
       }
     end

diff --git a/app/models/arm.rb b/app/models/arm.rb
@@ -68,8 +68,8 @@ def name_unique_to_protocol
   end
 
   def sanitized_name
-    #Sanitized for Excel
-    name.gsub(/\[|\]|\*|\/|\\|\?|\:/, ' ')
+    # Sanitized for Excel
+    name.gsub(/\[|\]|\*|\/|\\|\?|\:/, ' ').truncate(31) 
   end
 
   def update_liv_subject_counts