Merge branch 'attachment_file_types' into dev

elad-eyal · Sep 5, 2019 · 221cfea · 221cfea
2 parents 497b197 + 3b56281
commit 221cfea
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/models/event_attachment.rb b/app/models/event_attachment.rb
@@ -1,5 +1,5 @@
 class EventAttachment < ApplicationRecord
-  ATTACHMENT_TITLES = %w(proposal slides poster video other).freeze
+  ATTACHMENT_TITLES = %w(proposal poster slides handouts media video other).freeze
   belongs_to :event
 
   has_attached_file :attachment

diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -945,11 +945,13 @@ en:
     all_events: All events
     all_rating: All ratings
     predefined_title_types:
+      handouts: handouts
+      media: media
+      other: other
+      poster: poster
       proposal: proposal
       slides: slides
-      poster: poster
       video: video
-      other: other
     average_feedback: 'Average Feedback:'
     average_speaker_feedback: 'Average feedback as speaker:'
     cancel_event: Cancel event