Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-03-06 12:31:40 +01:00
Code Issues Packages Projects Releases Activity

Refactor: Moved ApplicationController#attach_files to the Attachment model

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3523 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis
2010-03-02 19:26:03 +00:00
parent 81d617cd5b
commit 0fd7e2d696
7 changed files with 54 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/documents_controller.rb
View File

@@ -47,7 +47,8 @@ class DocumentsController < ApplicationController
def new
@document = @project.documents.build(params[:document])
if request.post? and @document.save
attach_files(@document, params[:attachments])
attachments = Attachment.attach_files(@document, params[:attachments])
flash[:warning] = attachments[:flash] if attachments[:flash]
flash[:notice] = l(:notice_successful_create)
redirect_to :action => 'index', :project_id => @project
end
@@ -67,8 +68,10 @@ class DocumentsController < ApplicationController
end
def add_attachment
attachments = attach_files(@document, params[:attachments])
Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('document_added')
attachments = Attachment.attach_files(@document, params[:attachments])
flash[:warning] = attachments[:flash] if attachments[:flash]
Mailer.deliver_attachments_added(attachments[:files]) if attachments.present? && attachments[:files].present? && Setting.notified_events.include?('document_added')
redirect_to :action => 'show', :id => @document
end