Merge 6b65559ebd into e11ad83b32
This commit is contained in:
commit
7e485e5d4b
1 changed files with 21 additions and 15 deletions
|
|
@ -1,29 +1,35 @@
|
||||||
class EventAttachment < ActiveRecord::Base
|
class EventAttachment < ActiveRecord::Base
|
||||||
has_paper_trail
|
has_paper_trail
|
||||||
|
|
||||||
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, :path => ":rails_root/storage/:rails_env/attachments/:id/:style/:basename.:extension"
|
validates_attachment_content_type :attachment, content_type:
|
||||||
|
['text/plain', 'image/jpg', 'image/jpeg', 'image/pjpeg', 'image/png', 'image/x-png', 'image/gif',
|
||||||
|
'application/pdf', 'application/msword', 'applicationvnd.ms-word',
|
||||||
|
'applicaiton/vnd.openxmlformats-officedocument.wordprocessingm1.document',
|
||||||
|
'application/msexcel', 'application/vnd.ms-excel',
|
||||||
|
'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
|
||||||
|
'application/mspowerpoint', 'application/vnd.ms-powerpoint',
|
||||||
|
'application/vnd.openxmlformats-officedocument.presentationml.presentation',
|
||||||
|
'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(
|
||||||
"delete_url" => conference_proposal_event_attachment_path(self.event.conference.short_title, self.event_id, self.id),
|
self.event.conference.short_title, self.event_id, self.id),
|
||||||
"delete_type" => "DELETE"
|
'delete_url' => conference_proposal_event_attachment_path(
|
||||||
|
self.event.conference.short_title, self.event_id, self.id),
|
||||||
|
'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"
|
||||||
|
|
||||||
#has_paper_trail :meta => {:associated_id => :event_id, :associated_type => "Event"}
|
#has_paper_trail :meta => {:associated_id => :event_id, :associated_type => "Event"}
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue