Mercurial > hg > soundsoftware-site
comparison app/controllers/.svn/text-base/files_controller.rb.svn-base @ 41:7f0e922c8982 luisf
merged with new version from trunk
| author | luisf |
|---|---|
| date | Fri, 19 Nov 2010 14:45:28 +0000 |
| parents | 94944d00e43c |
| children | cbce1fd3b1b7 |
comparison
equal
deleted
inserted
replaced
| 35:67e8aef29de9 | 41:7f0e922c8982 |
|---|---|
| 26 def create | 26 def create |
| 27 container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id])) | 27 container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id])) |
| 28 attachments = Attachment.attach_files(container, params[:attachments]) | 28 attachments = Attachment.attach_files(container, params[:attachments]) |
| 29 render_attachment_warning_if_needed(container) | 29 render_attachment_warning_if_needed(container) |
| 30 | 30 |
| 31 if !attachments.empty? && Setting.notified_events.include?('file_added') | 31 if !attachments.empty? && !attachments[:files].blank? && Setting.notified_events.include?('file_added') |
| 32 Mailer.deliver_attachments_added(attachments[:files]) | 32 Mailer.deliver_attachments_added(attachments[:files]) |
| 33 end | 33 end |
| 34 redirect_to project_files_path(@project) | 34 redirect_to project_files_path(@project) |
| 35 end | 35 end |
| 36 end | 36 end |