jro_apps/redmine Commit - r977:86319feef236

Added ApplicationController#attach_files as a common method to attach files in all actions....

Jean-Philippe Lang -

r977:86319feef236

parent child

Context file:

r977:86319feef236

Collapse all files

app/controllers/application.rb +13 0

@@ -144,6 +144,19 class ApplicationController < ActionController::Base
144	def accept_key_auth_actions	144	def accept_key_auth_actions
145	self.class.read_inheritable_attribute('accept_key_auth_actions') \|\| []	145	self.class.read_inheritable_attribute('accept_key_auth_actions') \|\| []
146	end	146	end
		147
		148	# TODO: move to model
		149	def attach_files(obj, files)
		150	attachments = []
		151	if files && files.is_a?(Array)
		152	files.each do \|file\|
		153	next unless file.size > 0
		154	a = Attachment.create(:container => obj, :file => file, :author => User.current)
		155	attachments << a unless a.new_record?
		156	end
		157	end
		158	attachments
		159	end
147		160
148	# qvalues http header parser	161	# qvalues http header parser
149	# code taken from webrick	162	# code taken from webrick

app/controllers/documents_controller.rb +2 -8

               end
               def add_attachment
-                # Save the attachments
+                attachments = attach_files(@document, params[:attachments])
-                @attachments = []
+                Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('document_added')
-                params[:attachments].each { |file|
-                  next unless file.size > 0
-                  a = Attachment.create(:container => @document, :file => file, :author => User.current)
-                  @attachments << a unless a.new_record?
-                } if params[:attachments] and params[:attachments].is_a? Array
-                Mailer.deliver_attachments_added(@attachments) if !@attachments.empty? && Setting.notified_events.include?('document_added')
                 redirect_to :action => 'show', :id => @document
               end

app/controllers/issues_controller.rb +4 -16

               def add_note
                 journal = @issue.init_journal(User.current, params[:notes])
-                params[:attachments].each { |file|
+                attachments = attach_files(@issue, params[:attachments])
-                  next unless file.size > 0
+                attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
-                  a = Attachment.create(:container => @issue, :file => file, :author => User.current)
-                  journal.details << JournalDetail.new(:property => 'attachment',
-                                                       :prop_key => a.id,
-                                                       :value => a.filename) unless a.new_record?
-                } if params[:attachments] and params[:attachments].is_a? Array
                 if journal.save
                   flash[:notice] = l(:notice_successful_update)
                   Mailer.deliver_issue_edit(journal) if Setting.notified_events.include?('issue_updated')
                     journal = @issue.init_journal(User.current, params[:notes])
                     @issue.status = @new_status
                     if @issue.update_attributes(params[:issue])
-                      # Save attachments
+                      attachments = attach_files(@issue, params[:attachments])
-                      params[:attachments].each { |file|
+                      attachments.each {|a| journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
-                        next unless file.size > 0
-                        a = Attachment.create(:container => @issue, :file => file, :author => User.current)
-                        journal.details << JournalDetail.new(:property => 'attachment',
-                                                             :prop_key => a.id,
-                                                             :value => a.filename) unless a.new_record?
-                      } if params[:attachments] and params[:attachments].is_a? Array
                       # Log time
                       if current_role.allowed_to?(:log_time)
                         @time_entry ||= TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)

app/controllers/messages_controller.rb +3 -9

                   @message.sticky = params[:message]['sticky']
                 end
                 if request.post? && @message.save
-                  params[:attachments].each { |file|
+                  attach_files(@message, params[:attachments])
-                    Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
-                  } if params[:attachments] and params[:attachments].is_a? Array
                   redirect_to :action => 'show', :id => @message
                 end
               end
                 @reply.board = @board
                 @topic.children << @reply
                 if !@reply.new_record?
-                  params[:attachments].each { |file|
+                  attach_files(@reply, params[:attachments])
-                    Attachment.create(:container => @reply, :file => file, :author => User.current) if file.size > 0
-                  } if params[:attachments] and params[:attachments].is_a? Array
                 end
                 redirect_to :action => 'show', :id => @topic
               end
                   @message.sticky = params[:message]['sticky']
                 end
                 if request.post? && @message.update_attributes(params[:message])
-                  params[:attachments].each { |file|
+                  attach_files(@message, params[:attachments])
-                    Attachment.create(:container => @message, :file => file, :author => User.current) if file.size > 0
-                  } if params[:attachments] and params[:attachments].is_a? Array
                   flash[:notice] = l(:notice_successful_update)
                   redirect_to :action => 'show', :id => @topic
                 end

app/controllers/projects_controller.rb +4 -16

               def add_document
                 @document = @project.documents.build(params[:document])
                 if request.post? and @document.save
-                  # Save the attachments
+                  attach_files(@document, params[:attachments])
-                  params[:attachments].each { |a|
-                    Attachment.create(:container => @document, :file => a, :author => User.current) unless a.size == 0
-                  } if params[:attachments] and params[:attachments].is_a? Array
                   flash[:notice] = l(:notice_successful_create)
                   Mailer.deliver_document_added(@document) if Setting.notified_events.include?('document_added')
                   redirect_to :action => 'list_documents', :id => @project
                   @custom_values = @project.custom_fields_for_issues(@issue.tracker).collect { |x| CustomValue.new(:custom_field => x, :customized => @issue, :value => params["custom_fields"][x.id.to_s]) }
                   @issue.custom_values = @custom_values
                   if @issue.save
-                    if params[:attachments] && params[:attachments].is_a?(Array)
+                    attach_files(@issue, params[:attachments])
-                      # Save attachments
-                      params[:attachments].each {|a| Attachment.create(:container => @issue, :file => a, :author => User.current) unless a.size == 0}
-                    end
                     flash[:notice] = l(:notice_successful_create)
                     Mailer.deliver_issue_add(@issue) if Setting.notified_events.include?('issue_added')
                     redirect_to :controller => 'issues', :action => 'index', :project_id => @project
               def add_file
                 if request.post?
                   @version = @project.versions.find_by_id(params[:version_id])
-                  # Save the attachments
+                  attachments = attach_files(@issue, params[:attachments])
-                  @attachments = []
+                  Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('file_added')
-                  params[:attachments].each { |file|
-                    next unless file.size > 0
-                    a = Attachment.create(:container => @version, :file => file, :author => User.current)
-                    @attachments << a unless a.new_record?
-                  } if params[:attachments] and params[:attachments].is_a? Array
-                  Mailer.deliver_attachments_added(@attachments) if !@attachments.empty? && Setting.notified_events.include?('file_added')
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                 end
                 @versions = @project.versions.sort

app/controllers/wiki_controller.rb +1 -5

               def add_attachment
                 @page = @wiki.find_page(params[:page])
-                # Save the attachments
+                attach_files(@page, params[:attachments])
-                params[:attachments].each { |file|
-                  next unless file.size > 0
-                  a = Attachment.create(:container => @page, :file => file, :author => User.current)
-                } if params[:attachments] and params[:attachments].is_a? Array
                 redirect_to :action => 'index', :page => @page.title
               end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages