diff --git a/app/models/event_news_file.rb b/app/models/event_news_file.rb index 0a18bf0..a86abda 100644 --- a/app/models/event_news_file.rb +++ b/app/models/event_news_file.rb @@ -11,10 +11,12 @@ class EventNewsFile field :choose_lang, :type => Array, :default => ["en","zh_tw"] field :privacy_type, type: String, default: 'public' belongs_to :event_news - scope :to_fronted, ->(locale=I18n.locale){ self.map{|file| file.to_fronted(locale)}.compact rescue [] } + def self.to_fronted(locale=I18n.locale) + self.all.map{|file| file.to_fronted(locale)}.compact rescue [] + end def to_fronted(locale=I18n.locale) file = self - file.enabled_for?(locale) && !file[:file].blank? ? { "file_url" => "/xhr/event_news/file/#{file.id}/#{file['file']}" + "\" title=\"#{file.file_title}", + (file.enabled_for?(locale) && !file[:file].blank?) ? { "file_url" => "/xhr/announcements/file/#{file.id}/#{file['file']}" + "\" title=\"#{file.file_title}", "file_title" => (file.title.blank? ? URI.unescape(File.basename(file.file.path)) : file.title rescue '') } : nil rescue nil end