jro_apps/redmine Commit - r3409:0fd7e2d696cf

Refactor: Moved ApplicationController#attach_files to the Attachment model...

Eric Davis -

r3409:0fd7e2d696cf

parent child

Context file:

r3409:0fd7e2d696cf

Collapse all files

app/controllers/application_controller.rb 0 -21

@@ -257,27 +257,6 class ApplicationController < ActionController::Base
257	self.class.read_inheritable_attribute('accept_key_auth_actions') \|\| []	257	self.class.read_inheritable_attribute('accept_key_auth_actions') \|\| []
258	end	258	end
259		259
260	# TODO: move to model
261	def attach_files(obj, attachments)
262	attached = []
263	unsaved = []
264	if attachments && attachments.is_a?(Hash)
265	attachments.each_value do \|attachment\|
266	file = attachment['file']
267	next unless file && file.size > 0
268	a = Attachment.create(:container => obj,
269	:file => file,
270	:description => attachment['description'].to_s.strip,
271	:author => User.current)
272	a.new_record? ? (unsaved << a) : (attached << a)
273	end
274	if unsaved.any?
275	flash[:warning] = l(:warning_attachments_not_saved, unsaved.size)
276	end
277	end
278	attached
279	end
280
281	# Returns the number of objects that should be displayed	260	# Returns the number of objects that should be displayed
282	# on the paginated list	261	# on the paginated list
283	def per_page_option	262	def per_page_option

app/controllers/documents_controller.rb +6 -3

               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
               end
               def add_attachment
-                attachments = attach_files(@document, params[:attachments])
+                attachments = Attachment.attach_files(@document, params[:attachments])
-                Mailer.deliver_attachments_added(attachments) if !attachments.empty? && Setting.notified_events.include?('document_added')
+                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

app/controllers/issues_controller.rb +5 -5

                   @issue.status = (@allowed_statuses.include? requested_status) ? requested_status : default_status
                   call_hook(:controller_issues_new_before_save, { :params => params, :issue => @issue })
                   if @issue.save
-                    attach_files(@issue, params[:attachments])
+                    attachments = Attachment.attach_files(@issue, params[:attachments])
+                    flash[:warning] = attachments[:flash] if attachments[:flash]
                     flash[:notice] = l(:notice_successful_create)
                     call_hook(:controller_issues_new_after_save, { :params => params, :issue => @issue})
                     respond_to do |format|
               # TODO: Temporary utility method for #update.  Should be split off
               # and moved to the Issue model (accepts_nested_attributes_for maybe?)
-              # TODO: move attach_files to the model so this can be moved to the
-              # model also
               def issue_update
                 if params[:time_entry] && params[:time_entry][:hours].present? && User.current.allowed_to?(:log_time, @project)
                   @time_entry = TimeEntry.new(:project => @project, :issue => @issue, :user => User.current, :spent_on => Date.today)
                 end
                 if @issue.valid?
-                  attachments = attach_files(@issue, params[:attachments])
+                  attachments = Attachment.attach_files(@issue, params[:attachments])
-                  attachments.each {|a| @journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
+                  flash[:warning] = attachments[:flash] if attachments[:flash]
+                  attachments[:files].each {|a| @journal.details << JournalDetail.new(:property => 'attachment', :prop_key => a.id, :value => a.filename)}
                   call_hook(:controller_issues_edit_before_save, { :params => params, :issue => @issue, :time_entry => @time_entry, :journal => @journal})
                   if @issue.save
                     if !@journal.new_record?

app/controllers/messages_controller.rb +6 -3

                 end
                 if request.post? && @message.save
                   call_hook(:controller_messages_new_after_save, { :params => params, :message => @message})
-                  attach_files(@message, params[:attachments])
+                  attachments = Attachment.attach_files(@message, params[:attachments])
+                  flash[:warning] = attachments[:flash] if attachments[:flash]
                   redirect_to :action => 'show', :id => @message
                 end
               end
                 @topic.children << @reply
                 if !@reply.new_record?
                   call_hook(:controller_messages_reply_after_save, { :params => params, :message => @reply})
-                  attach_files(@reply, params[:attachments])
+                  attachments = Attachment.attach_files(@reply, params[:attachments])
+                  flash[:warning] = attachments[:flash] if attachments[:flash]
                 end
                 redirect_to :action => 'show', :id => @topic, :r => @reply
               end
                   @message.sticky = params[:message]['sticky']
                 end
                 if request.post? && @message.update_attributes(params[:message])
-                  attach_files(@message, params[:attachments])
+                  attachments = Attachment.attach_files(@message, params[:attachments])
+                  flash[:warning] = attachments[:flash] if attachments[:flash]
                   flash[:notice] = l(:notice_successful_update)
                   @message.reload
                   redirect_to :action => 'show', :board_id => @message.board, :id => @message.root, :r => (@message.parent_id && @message.id)

app/controllers/projects_controller.rb +4 -2

               def add_file
                 if request.post?
                   container = (params[:version_id].blank? ? @project : @project.versions.find_by_id(params[:version_id]))
-                  attachments = attach_files(container, params[:attachments])
+                  attachments = Attachment.attach_files(container, params[:attachments])
+                  flash[:warning] = attachments[:flash] if attachments[:flash]
                   if !attachments.empty? && Setting.notified_events.include?('file_added')
-                    Mailer.deliver_attachments_added(attachments)
+                    Mailer.deliver_attachments_added(attachments[:files])
                   end
                   redirect_to :controller => 'projects', :action => 'list_files', :id => @project
                   return

app/controllers/wiki_controller.rb +6 -3

                   @content.version = @page.content.version
                 else
                   if !@page.new_record? && @content.text == params[:content][:text]
-                    attach_files(@page, params[:attachments])
+                    attachments = Attachment.attach_files(@page, params[:attachments])
+                    flash[:warning] = attachments[:flash] if attachments[:flash]
                     # don't save if text wasn't changed
                     redirect_to :action => 'index', :id => @project, :page => @page.title
                     return
                   @content.author = User.current
                   # if page is new @page.save will also save content, but not if page isn't a new record
                   if (@page.new_record? ? @page.save : @content.save)
-                    attach_files(@page, params[:attachments])
+                    attachments = Attachment.attach_files(@page, params[:attachments])
+                    flash[:warning] = attachments[:flash] if attachments[:flash]
                     call_hook(:controller_wiki_edit_after_save, { :params => params, :page => @page})
                     redirect_to :action => 'index', :id => @project, :page => @page.title
                   end
               def add_attachment
                 return render_403 unless editable?
-                attach_files(@page, params[:attachments])
+                attachments = Attachment.attach_files(@page, params[:attachments])
+                flash[:warning] = attachments[:flash] if attachments[:flash]
                 redirect_to :action => 'index', :page => @page.title
               end

app/models/attachment.rb +27 0

@@ -133,6 +133,33 class Attachment < ActiveRecord::Base
133	def readable?	133	def readable?
134	File.readable?(diskfile)	134	File.readable?(diskfile)
135	end	135	end
		136
		137	# Bulk attaches a set of files to an object
		138	#
		139	# Returns a Hash of the results:
		140	# :files => array of the attached files
		141	# :unsaved => array of the files that could not be attached
		142	# :flash => warning message
		143	def self.attach_files(obj, attachments)
		144	attached = []
		145	unsaved = []
		146	flash = nil
		147	if attachments && attachments.is_a?(Hash)
		148	attachments.each_value do \|attachment\|
		149	file = attachment['file']
		150	next unless file && file.size > 0
		151	a = Attachment.create(:container => obj,
		152	:file => file,
		153	:description => attachment['description'].to_s.strip,
		154	:author => User.current)
		155	a.new_record? ? (unsaved << a) : (attached << a)
		156	end
		157	if unsaved.any?
		158	flash = l(:warning_attachments_not_saved, unsaved.size)
		159	end
		160	end
		161	{:files => attached, :flash => flash, :unsaved => unsaved}
		162	end
136		163
137	private	164	private
138	def sanitize_filename(value)	165	def sanitize_filename(value)

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