gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes by houndci

Browse source
This commit is contained in:
Gopesh Tulsyan 2014-05-16 12:23:16 +05:30
parent 8c69d0f651
commit 1f3e9a39c8
1 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

36
app/models/event_attachment.rb
View file

@ -3,29 +3,29 @@ class EventAttachment < ActiveRecord::Base
belongs_to :event belongs_to :event
attr_accessible :public, :attachment, :event_id, :title attr_accessible :public, :attachment, :event_id, :title
has_attached_file :attachment has_attached_file :attachment
validates_attachment_content_type :attachment, content_type: ['text/plain','image/jpg','image/jpeg', validates_attachment_content_type :attachment, content_type:
'image/pjpeg','image/png','image/x-png','image/gif','application/pdf','application/msword', ['text/plain', 'image/jpg', 'image/jpeg','image/pjpeg', 'image/png', 'image/x-png', 'image/gif',
'applicationvnd.ms-word','applicaiton/vnd.openxmlformats-officedocument.wordprocessingm1.document', 'application/pdf', 'application/msword','applicationvnd.ms-word',
'application/msexcel','application/vnd.ms-excel', 'applicaiton/vnd.openxmlformats-officedocument.wordprocessingm1.document',
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/msexcel', 'application/vnd.ms-excel',
'application/mspowerpoint','application/vnd.ms-powerpoint', 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
'application/vnd.openxmlformats-officedocument.presentationml.presentation', 'application/mspowerpoint', 'application/vnd.ms-powerpoint',
'application/vnd.oasis.opendocument.presentation', 'application/vnd.openxmlformats-officedocument.presentationml.presentation',
'application/vnd.openxmlformats-officedocument.wordprocessingml.document'] 'application/vnd.oasis.opendocument.presentation',
'application/vnd.openxmlformats-officedocument.wordprocessingml.document']
include Rails.application.routes.url_helpers include Rails.application.routes.url_helpers
def to_jq_upload def to_jq_upload
{ {
"name" => read_attribute(:attachment_file_name), "name" => read_attribute(:attachment_file_name),
"size" => read_attribute(:attachment_file_size), "size" => read_attribute(:attachment_file_size),
"title" => read_attribute(:title), "title" => read_attribute(:title),
"public" => read_attribute(:public), "public" => read_attribute(:public),
#"url" => attachment.url(:original), #"url" => attachment.url(:original),
"url" => conference_proposal_event_attachment_path(self.event.conference.short_title, self.event_id, self.id), "url" => conference_proposal_event_attachment_path(self.event.conference.short_title, self.event_id, self.id),
"delete_url" => conference_proposal_event_attachment_path(self.event.conference.short_title, self.event_id, self.id), "delete_url" => conference_proposal_event_attachment_path(self.event.conference.short_title, self.event_id, self.id),
"delete_type" => "DELETE" "delete_type" => "DELETE"
} }
end end
#:path => ":rails_root/public/system/:attachment/:id/:style/:filename", #:path => ":rails_root/public/system/:attachment/:id/:style/:filename",
# :url => "/system/:attachment/:id/:style/:filename" # :url => "/system/:attachment/:id/:style/:filename"